feat(1.112): update patches (#2750)

2026-04-11 16:27:18 +10:00 · 2026-03-17 19:27:30 +01:00
parent 2321c2c695
commit 803457343a
15 changed files with 397 additions and 278 deletions
--- a/patches/brand.patch
+++ b/patches/brand.patch
@@ -19,7 +19,7 @@ index 12b50f3..7cb0d1b 100644
 +		completions.push(this.newSimpleCompletionItem(getText('appName'), range, vscode.l10n.t("e.g. !!APP_NAME!!")));
 		completions.push(this.newSimpleCompletionItem(getText('remoteName'), range, vscode.l10n.t("e.g. SSH")));
 diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json
-index 057ec21..53c32b4 100644
+index d3de224..94eea2f 100644
 --- a/extensions/css-language-features/package.nls.json
 +++ b/extensions/css-language-features/package.nls.json
@@ -4,4 +4,4 @@
@@ -45,7 +45,7 @@ index 057ec21..53c32b4 100644
 +	"scss.completion.triggerPropertyValueCompletion.desc": "By default, !!APP_NAME!! triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
 	"scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
 diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json
-index 2a58c39..8224615 100644
+index 683bcc7..312b4b2 100644
 --- a/extensions/emmet/package.nls.json
 +++ b/extensions/emmet/package.nls.json
@@ -1,3 +1,3 @@
@@ -62,7 +62,7 @@ index 1be4d0e..647b147 100644
 -export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations.");
 +export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as !!APP_NAME!! generates these automatically from your package.json contribution declarations.");
 diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
-index 5c73304..3294fd8 100644
+index 6249500..6d89804 100644
 --- a/extensions/extension-editing/src/extensionLinter.ts
 +++ b/extensions/extension-editing/src/extensionLinter.ts
@@ -34,3 +34,3 @@ const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a
@@ -71,37 +71,37 @@ index 5c73304..3294fd8 100644
 +const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the !!APP_NAME!! team.");
 
 diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
-index 9d469e3..54ec4c4 100644
+index 147a75f..565109e 100644
 --- a/extensions/git/package.nls.json
 +++ b/extensions/git/package.nls.json
-@@ -254,3 +254,3 @@
+@@ -259,3 +259,3 @@
 			"{Locked='](command:git.showOutput'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -282,4 +282,4 @@
+@@ -287,4 +287,4 @@
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 -	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 -	"config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 +	"config.terminalAuthentication": "Controls whether to enable !!APP_NAME!! to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 +	"config.terminalGitEditor": "Controls whether to enable !!APP_NAME!! to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.",
-@@ -353,3 +353,3 @@
+@@ -358,3 +358,3 @@
 			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -363,3 +363,3 @@
+@@ -368,3 +368,3 @@
 			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -373,3 +373,3 @@
+@@ -378,3 +378,3 @@
 			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -385,6 +385,6 @@
+@@ -390,6 +390,6 @@
 	"view.workbench.scm.disabled": {
 -		"message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -110,7 +110,7 @@ index 9d469e3..54ec4c4 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -393,6 +393,6 @@
+@@ -398,6 +398,6 @@
 	"view.workbench.scm.empty": {
 -		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -119,7 +119,7 @@ index 9d469e3..54ec4c4 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -401,6 +401,6 @@
+@@ -406,6 +406,6 @@
 	"view.workbench.scm.folder": {
 -		"message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -128,7 +128,7 @@ index 9d469e3..54ec4c4 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -409,6 +409,6 @@
+@@ -414,6 +414,6 @@
 	"view.workbench.scm.workspace": {
 -		"message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -137,7 +137,7 @@ index 9d469e3..54ec4c4 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -417,6 +417,6 @@
+@@ -422,6 +422,6 @@
 	"view.workbench.scm.emptyWorkspace": {
 -		"message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -146,27 +146,27 @@ index 9d469e3..54ec4c4 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -435,3 +435,3 @@
+@@ -440,3 +440,3 @@
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -444,3 +444,3 @@
+@@ -449,3 +449,3 @@
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -452,3 +452,3 @@
+@@ -457,3 +457,3 @@
 			"{Locked='](command:git.manageUnsafeRepositories'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -460,3 +460,3 @@
+@@ -465,3 +465,3 @@
 			"{Locked='](command:git.manageUnsafeRepositories'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -465,6 +465,6 @@
+@@ -470,6 +470,6 @@
 	"view.workbench.scm.closedRepository": {
 -		"message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -175,7 +175,7 @@ index 9d469e3..54ec4c4 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -473,6 +473,6 @@
+@@ -478,6 +478,6 @@
 	"view.workbench.scm.closedRepositories": {
 -		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -184,18 +184,18 @@ index 9d469e3..54ec4c4 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -484,3 +484,3 @@
+@@ -489,3 +489,3 @@
 			"{Locked='](command:git.clone'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -488,3 +488,3 @@
+@@ -493,3 +493,3 @@
 	},
 -	"view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
 +	"view.workbench.learnMore": "To learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm)."
 }
 diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json
-index 4acc8ac..5fa11e4 100644
+index 0449759..70a7c7c 100644
 --- a/extensions/github/package.nls.json
 +++ b/extensions/github/package.nls.json
@@ -2,3 +2,3 @@
@@ -273,7 +273,7 @@ index e82030e..ac999f6 100644
 +	"displayName": "Jake support for !!APP_NAME!!",
 	"jake.taskDefinition.type.description": "The Jake task to customize.",
 diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json
-index 9052d37..f505551 100644
+index 30199b2..008aed7 100644
 --- a/extensions/json-language-features/package.nls.json
 +++ b/extensions/json-language-features/package.nls.json
@@ -11,3 +11,3 @@
@@ -332,7 +332,7 @@ index 1cb74c5..3f5f892 100644
 +		<a href="#" class="open-file-link">${vscode.l10n.t("Open file using !!APP_NAME!!'s standard text/binary editor?")}</a>
 	</div>
 diff --git a/extensions/notebook-renderers/package.json b/extensions/notebook-renderers/package.json
-index e9890ca..6bed1e6 100644
+index fad11bc..64e48ce 100644
 --- a/extensions/notebook-renderers/package.json
 +++ b/extensions/notebook-renderers/package.json
@@ -22,3 +22,3 @@
@@ -341,7 +341,7 @@ index e9890ca..6bed1e6 100644
 +				"displayName": "!!APP_NAME!! Builtin Notebook Output Renderer",
 				"requiresMessaging": "never",
 diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
-index 56a77ff..e9f32d1 100644
+index 1235a55..b647563 100644
 --- a/extensions/npm/package.nls.json
 +++ b/extensions/npm/package.nls.json
@@ -2,3 +2,3 @@
@@ -350,7 +350,7 @@ index 56a77ff..e9f32d1 100644
 +	"displayName": "NPM support for !!APP_NAME!!",
 	"workspaceTrust": "This extension executes tasks, which require trust to run.",
 diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
-index a8bbe5d..00694dc 100644
+index d52cabb..eb3a76c 100644
 --- a/extensions/swift/syntaxes/swift.tmLanguage.json
 +++ b/extensions/swift/syntaxes/swift.tmLanguage.json
@@ -260,3 +260,3 @@
@@ -359,10 +359,10 @@ index a8bbe5d..00694dc 100644
 +					"comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks !!APP_NAME!! / Atom, see https://github.com/textmate/swift.tmbundle/issues/29",
 					"name": "support.variable.swift",
 diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
-index 8c28dd8..bf50baf 100644
+index 48955c3..0ff7003 100644
 --- a/extensions/typescript-language-features/package.nls.json
 +++ b/extensions/typescript-language-features/package.nls.json
-@@ -130,5 +130,5 @@
+@@ -136,5 +136,5 @@
 	"configuration.tsserver.experimental.enableProjectDiagnostics.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.experimental.enableProjectDiagnostics#` instead.",
 -	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VS Code's locale.",
 +	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use !!APP_NAME!!'s locale.",
@@ -370,12 +370,12 @@ index 8c28dd8..bf50baf 100644
 -	"typescript.locale.auto": "Use VS Code's configured display language.",
 +	"typescript.locale.auto": "Use !!APP_NAME!!'s configured display language.",
 	"configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.",
-@@ -241,3 +241,3 @@
+@@ -247,3 +247,3 @@
 	"configuration.workspaceSymbols.excludeLibrarySymbols.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.workspaceSymbols.excludeLibrarySymbols#` instead.",
 -	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
 +	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in !!APP_NAME!!.",
 	"typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.",
-@@ -252,5 +252,5 @@
+@@ -258,5 +258,5 @@
 	"configuration.suggest.completeJSDocs.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.suggest.jsdoc.enabled#` instead.",
 -	"configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 +	"configuration.tsserver.useVsCodeWatcher": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
@@ -383,17 +383,17 @@ index 8c28dd8..bf50baf 100644
 -	"configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 +	"configuration.tsserver.watchOptions.vscode": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 	"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
-@@ -307,3 +307,3 @@
+@@ -313,3 +313,3 @@
 	"configuration.suggest.objectLiteralMethodSnippets.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.suggest.objectLiteralMethodSnippets.enabled#` instead.",
 -	"configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.",
 +	"configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that !!APP_NAME!! is running in a trusted context.",
 	"configuration.tsserver.web.projectWideIntellisense.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.projectWideIntellisense.enabled#` instead.",
-@@ -313,3 +313,3 @@
+@@ -319,3 +319,3 @@
 	"configuration.tsserver.web.typeAcquisition.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.typeAcquisition.enabled#` instead.",
-	"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.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want !!APP_NAME!! to detect a Node installation.",
+-	"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.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or `node` if you want !!APP_NAME!! to detect a Node installation.",
 	"configuration.tsserver.nodePath.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.node.path#` instead.",
-@@ -328,7 +328,7 @@
+@@ -334,7 +334,7 @@
 	"walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript",
 -	"walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
 -	"walkthroughs.nodejsWelcome.debugJsFile.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.",
@@ -452,7 +452,7 @@ index 507f9e6..067fb79 100644
 +							vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList));
 					} else {
 diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
-index b320fa7..9bf9f1c 100644
+index 0ba8a2d..db93abf 100644
 --- a/extensions/vscode-api-tests/package.json
 +++ b/extensions/vscode-api-tests/package.json
@@ -2,3 +2,3 @@
@@ -530,7 +530,7 @@ index a351aa7..c32e3ef 100644
 +			throw Error(`Failed to download and unzip !!APP_NAME!! ${quality} - ${commit}`);
 		}
 diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts
-index 3e6c9f0..6d4176f 100644
+index c342647..17af7ae 100644
 --- a/extensions/vscode-test-resolver/src/extension.ts
 +++ b/extensions/vscode-test-resolver/src/extension.ts
@@ -180,3 +180,3 @@ export function activate(context: vscode.ExtensionContext) {
@@ -539,15 +539,15 @@ index 3e6c9f0..6d4176f 100644
 +					progress.report({ message: 'Installing !!APP_NAME!! Server' });
 					serverLocation = await downloadAndUnzipVSCodeServer(updateUrl, commit, quality, serverBin, m => outputChannel.appendLine(m));
 diff --git a/src/main.ts b/src/main.ts
-index ec2e45c..8d89e2b 100644
+index 42f599c..1f90b59 100644
 --- a/src/main.ts
 +++ b/src/main.ts
-@@ -412,3 +412,3 @@ function createDefaultArgvConfigSync(argvConfigPath: string): void {
+@@ -413,3 +413,3 @@ function createDefaultArgvConfigSync(argvConfigPath: string): void {
 		const defaultArgvConfigContent = [
 -			'// This configuration file allows you to pass permanent command line arguments to VS Code.',
 +			'// This configuration file allows you to pass permanent command line arguments to !!APP_NAME!!.',
 			'// Only a subset of arguments is currently supported to reduce the likelihood of breaking',
-@@ -418,6 +418,6 @@ function createDefaultArgvConfigSync(argvConfigPath: string): void {
+@@ -419,6 +419,6 @@ function createDefaultArgvConfigSync(argvConfigPath: string): void {
 			'//',
 -			'// NOTE: Changing this file requires a restart of VS Code.',
 +			'// NOTE: Changing this file requires a restart of !!APP_NAME!!.',
@@ -557,10 +557,10 @@ index ec2e45c..8d89e2b 100644
 +			'	// This can help in cases where you see rendering issues in !!APP_NAME!!.',
 			'	// "disable-hardware-acceleration": true',
 diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
-index 7881f73..701a162 100644
+index c2c70d3..44941e9 100644
 --- a/src/vs/code/electron-main/app.ts
 +++ b/src/vs/code/electron-main/app.ts
-@@ -544,3 +544,3 @@ export class CodeApplication extends Disposable {
+@@ -550,3 +550,3 @@ export class CodeApplication extends Disposable {
 	async startup(): Promise<void> {
 -		this.logService.debug('Starting VS Code');
 +		this.logService.debug('Starting !!APP_NAME!!');
@@ -584,7 +584,7 @@ index c256dba..10a79c8 100644
 +export const ProductQualityContext = new RawContextKey<string>('productQualityType', '', localize('productQualityType', "Quality type of !!APP_NAME!!"));
 
 diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-index cdf0c67..d567815 100644
+index cef0d3c..e6016ae 100644
 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
 +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -153,3 +153,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
@@ -633,16 +633,16 @@ index 27fd88b..ad97d7b 100644
 +			description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from !!APP_NAME!!, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."),
 			type: 'boolean',
 diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts
-index 93dd62d..550ee91 100644
+index 53e3a78..888a549 100644
 --- a/src/vs/platform/update/common/update.config.contribution.ts
 +++ b/src/vs/platform/update/common/update.config.contribution.ts
-@@ -70,3 +70,3 @@ configurationRegistry.registerConfiguration({
+@@ -71,3 +71,3 @@ configurationRegistry.registerConfiguration({
 			title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates"),
 -			description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code versions in the background."),
 +			description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new !!APP_NAME!! versions in the background."),
 			included: isWindows && !isWeb
 diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
-index 3e5956f..1203e46 100644
+index c943bca..d5c8506 100644
 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
 +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -69,3 +69,3 @@ export type UpdateErrorClassification = {
@@ -687,7 +687,7 @@ index a04bbd0..202f130 100644
 +			ApiCommandArgument.String.with('viewId', 'Custom editor view id. This should be the viewType string for custom editors or the notebookType string for notebooks. Use \'default\' to use !!APP_NAME!!\'s default text editor'),
 			new ApiCommandArgument<vscode.ViewColumn | typeConverters.TextEditorOpenOptions | undefined, [vscode.ViewColumn?, ITextEditorOptions?] | undefined>('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions',
 diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
-index 15c7693..a8f1975 100644
+index 92e874d..d59e726 100644
 --- a/src/vs/workbench/api/common/extHostCommands.ts
 +++ b/src/vs/workbench/api/common/extHostCommands.ts
@@ -464,4 +464,4 @@ export class ApiCommandArgument<V, O = V> {
@@ -752,21 +752,21 @@ index c034874..b0bb4a0 100644
 +export const InAutomationContext = new RawContextKey<boolean>('inAutomation', false, localize('inAutomation', "Whether !!APP_NAME!! is running under automation/smoke test"));
 
 diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
-index d50fc45..93c4717 100644
+index ae0171f..060350f 100644
 --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
 +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
-@@ -539,3 +539,3 @@ configurationRegistry.registerConfiguration({
+@@ -558,3 +558,3 @@ configurationRegistry.registerConfiguration({
 				nls.localize('chat.mcp.access.none', "No access to MCP servers."),
 -				nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that VS Code is connected to."),
 +				nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that !!APP_NAME!! is connected to."),
 				nls.localize('chat.mcp.access.any', "Allow access to any installed MCP server.")
-@@ -566,3 +566,3 @@ configurationRegistry.registerConfiguration({
+@@ -585,3 +585,3 @@ configurationRegistry.registerConfiguration({
 						{
 -							key: 'chat.mcp.access.registry', value: nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that VS Code is connected to."),
 +							key: 'chat.mcp.access.registry', value: nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that !!APP_NAME!! is connected to."),
 						},
 diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
-index 1ff128a..5bfa019 100644
+index 1936819..8f3bd30 100644
 --- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
 +++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
@@ -119,3 +119,3 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
@@ -782,10 +782,10 @@ index 1ff128a..5bfa019 100644
 +				userDescription: localize('setupToolsDescription', "Scaffold a new workspace in !!APP_NAME!!"),
 				canBeReferencedInPrompt: true,
 diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
-index a6058e2..63cad20 100644
+index d814c0b..66237e0 100644
 --- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
 +++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
-@@ -230,5 +230,5 @@ export class PromptValidator {
+@@ -248,5 +248,5 @@ export class PromptValidator {
 							if (validGithubCopilotAttributeNames.value.has(attribute.key)) {
 -								report(toMarker(localize('promptValidator.ignoredAttribute.vscode-agent', "Attribute '{0}' is ignored when running locally in VS Code.", attribute.key), attribute.range, MarkerSeverity.Info));
 +								report(toMarker(localize('promptValidator.ignoredAttribute.vscode-agent', "Attribute '{0}' is ignored when running locally in !!APP_NAME!!.", attribute.key), attribute.range, MarkerSeverity.Info));
@@ -803,30 +803,30 @@ index 0b9ced3..731d952 100644
 +						description: nls.localize('debugServer', "For debug extension development only: if a port is specified !!APP_NAME!! tries to connect to a debug adapter running in server mode"),
 						default: 4711
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
-index 37e6e91..3dcfcf0 100644
+index 6e2b340..dfcfccb 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
-@@ -362,3 +362,3 @@ CommandsRegistry.registerCommand({
+@@ -363,3 +363,3 @@ CommandsRegistry.registerCommand({
 				description: '(optional) Options for installing the extension. Object with the following properties: ' +
 -					'`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ',
 +					'`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, !!APP_NAME!! installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ',
 				isOptional: true,
-@@ -369,3 +369,3 @@ CommandsRegistry.registerCommand({
+@@ -370,3 +370,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."),
 +							'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, !!APP_NAME!! installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."),
 							default: false
-@@ -374,3 +374,3 @@ CommandsRegistry.registerCommand({
+@@ -375,3 +375,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VS Code installs the pre-release version of the extension if available."),
 +							'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, !!APP_NAME!! installs the pre-release version of the extension if available."),
 							default: false
-@@ -379,3 +379,3 @@ CommandsRegistry.registerCommand({
+@@ -380,3 +380,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VS Code do not sync this extension when Settings Sync is on."),
 +							'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, !!APP_NAME!! do not sync this extension when Settings Sync is on."),
 							default: false
-@@ -904,4 +904,4 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
+@@ -909,4 +909,4 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 						Severity.Info,
 -						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."),
@@ -925,7 +925,7 @@ index 050dde4..a8a61bd 100644
 +				description: localize2('configureLocaleDescription', "Changes the locale of !!APP_NAME!! based on installed language packs. Common languages include French, Chinese, Spanish, Japanese, German, Korean, and more.")
 			}
 diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
-index 9e82f11..690fe56 100644
+index 864cc4f..b0b431a 100644
 --- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
 +++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
@@ -276,3 +276,3 @@ export class McpServersListView extends AbstractExtensionsListView<IWorkbenchMcp
@@ -968,7 +968,7 @@ index 9db6b8a..cecac9f 100644
 +					description: nls.localize('JsonSchema.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running background task.'),
 					default: false
 diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
-index 8d937a1..39e4e20 100644
+index 56eb132..f25deed 100644
 --- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
 +++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
@@ -439,3 +439,3 @@ const taskConfiguration: IJSONSchema = {
@@ -977,7 +977,7 @@ index 8d937a1..39e4e20 100644
 +			description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running task.'),
 			default: false
 diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
-index 9a74572..9a2e55a 100644
+index 01632be..ad6af05 100644
 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
 +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -210,3 +210,3 @@ export class TerminalViewPane extends ViewPane {
@@ -1018,7 +1018,7 @@ index 6cff748..98e3d6a 100644
 +function __vsc_esc -d "Emit escape sequences for !!APP_NAME!! shell integration"
 	builtin printf "\e]633;%s\a" (string join ";" -- $argv)
 diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
-index a16eaa8..965d80a 100644
+index afeac19..bcb52c0 100644
 --- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
 +++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -87,3 +87,3 @@ if (-not $env:VSCODE_PYTHON_AUTOACTIVATE_GUARD) {
@@ -1027,7 +1027,7 @@ index a16eaa8..965d80a 100644
 +			Write-Host "`e[0m`e[7m * `e[0;103m !!APP_NAME!! Python powershell activation failed with exit code $($activationError.Exception.Message) `e[0m"
 		}
 diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
-index 632938e..8d2a2de 100644
+index 132db6d..0dc7abe 100644
 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
 +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -316,3 +316,3 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
@@ -1070,7 +1070,7 @@ index 632938e..8d2a2de 100644
 -		markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.23.251008001) shipped with VS Code, instead of the one bundled with Windows."),
 +		markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.23.251008001) shipped with !!APP_NAME!!, instead of the one bundled with Windows."),
 		type: 'boolean',
-@@ -608,3 +608,3 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
+@@ -617,3 +617,3 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 		restricted: true,
 -		markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
 +		markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives !!APP_NAME!! insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
@@ -1112,17 +1112,17 @@ index 0f23e5a..27f311e 100644
 +				message = localize('terminal.voice.installSpeechExtension', "Would you like to install '!!APP_NAME!! Speech' extension from 'Microsoft'?");
 				run = () => commandService.executeCommand('workbench.extensions.installExtension', 'ms-vscode.vscode-speech');
 diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
-index 68b982c..dd44414 100644
+index 36f7d09..e6b14db 100644
 --- a/src/vs/workbench/contrib/update/browser/update.ts
 +++ b/src/vs/workbench/contrib/update/browser/update.ts
-@@ -620,4 +620,4 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
+@@ -639,4 +639,4 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
 							detail: newQuality === 'insider' ?
 -								nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of VS Code.") :
 -								nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of VS Code."),
 +								nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of !!APP_NAME!!.") :
 +								nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of !!APP_NAME!!."),
 							primaryButton: nls.localize({ key: 'reload', comment: ['&& denotes a mnemonic'] }, "&&Reload")
-@@ -656,3 +656,3 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
+@@ -675,3 +675,3 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
 						message: nls.localize('selectSyncService.message', "Choose the settings sync service to use after changing the version"),
 -						detail: nls.localize('selectSyncService.detail', "The Insiders version of VS Code will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."),
 +						detail: nls.localize('selectSyncService.detail', "The Insiders version of !!APP_NAME!! will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."),
@@ -1348,7 +1348,7 @@ index 1159e4c..d8ebb47 100644
 +				markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within !!APP_NAME!!. When used with `#{0}#`, you can enable the full functionality of !!APP_NAME!! without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES),
 				tags: [WORKSPACE_TRUST_SETTING_TAG],
 diff --git a/src/vs/workbench/electron-browser/desktop.contribution.ts b/src/vs/workbench/electron-browser/desktop.contribution.ts
-index fd09050..ac32743 100644
+index 4c3893a..9c3267a 100644
 --- a/src/vs/workbench/electron-browser/desktop.contribution.ts
 +++ b/src/vs/workbench/electron-browser/desktop.contribution.ts
@@ -448,3 +448,3 @@ import product from '../../platform/product/common/product.js';
@@ -1371,14 +1371,14 @@ index ea7f364..25c4fda 100644
 +		const productName = localize('!!APP_NAME!! for Web', "{0} for the Web", this.productService.nameLong);
 		const virtualWorkspaceSupport = this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(manifest);
 diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
-index 2ea95cd..f91cda9 100644
+index f9d57d5..73d4c66 100644
 --- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
 +++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -181,3 +181,3 @@ export const schema: IJSONSchema = {
 					type: 'string',
-					description: nls.localize('vscode.extension.engines.vscode', 'For VS Code extensions, specifies the VS Code version that the extension is compatible with. Cannot be *. For example: ^0.10.5 indicates compatibility with a minimum VS Code version of 0.10.5.'),
-+					description: nls.localize('vscode.extension.engines.vscode', 'For !!APP_NAME!! extensions, specifies the !!APP_NAME!! version that the extension is compatible with. Cannot be *. For example: ^0.10.5 indicates compatibility with a minimum !!APP_NAME!! version of 0.10.5.'),
- 					default: '^1.22.0',
+-					description: nls.localize('vscode.extension.engines.vscode', 'For VS Code extensions, specifies the VS Code version that the extension is compatible with. Cannot be *. For example: ^1.105.0 indicates compatibility with a minimum VS Code version of 1.105.0.'),
+					description: nls.localize('vscode.extension.engines.vscode', 'For !!APP_NAME!! extensions, specifies the !!APP_NAME!! version that the extension is compatible with. Cannot be *. For example: ^1.105.0 indicates compatibility with a minimum !!APP_NAME!! version of 1.105.0.'),
+ 					default: '^1.105.0',
@@ -187,3 +187,3 @@ export const schema: IJSONSchema = {
 		publisher: {
 -			description: nls.localize('vscode.extension.publisher', 'The publisher of the VS Code extension.'),
@@ -1438,7 +1438,7 @@ index 2b6104a..9d2dffd 100644
 +						label: nls.localize('relaunch', "Relaunch !!APP_NAME!!"),
 						run: () => {
 diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
-index cc56d9a..f446b8e 100644
+index 43da461..c7d4149 100644
 --- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
 +++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
@@ -199,3 +199,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse
--- a/patches/disable-copilot.patch
+++ b/patches/disable-copilot.patch
@@ -1,19 +1,19 @@
 diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
-index d1232f9..51121f9 100644
+index 1998414..cdc533b 100644
 --- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
 +++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
-@@ -204,3 +204,4 @@ abstract class OpenChatGlobalAction extends Action2 {
+@@ -206,3 +206,4 @@ abstract class OpenChatGlobalAction extends Action2 {
 				ChatContextKeys.Setup.hidden.negate(),
 -				ChatContextKeys.Setup.disabled.negate()
 +				ChatContextKeys.Setup.disabled.negate(),
 +				ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
 			)
-@@ -1161,3 +1162,3 @@ export function registerChatActions() {
+@@ -1142,3 +1143,3 @@ export function registerChatActions() {
 				precondition: ContextKeyExpr.and(
 -					ChatContextKeys.Setup.installed,
 +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 					ChatContextKeys.Setup.disabled.negate(),
-@@ -1692,3 +1693,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
+@@ -1715,3 +1716,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
 		ChatContextKeys.Setup.hidden.negate(),
 -		ChatContextKeys.Setup.disabled.negate()
 +		ChatContextKeys.Setup.disabled.negate(),
@@ -30,10 +30,10 @@ index b8c8e03..512e40f 100644
 +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 				)
 diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
-index d50fc45..ffc8a5b 100644
+index be62dda..7b5f1ed 100644
 --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
 +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
-@@ -1195,3 +1195,3 @@ configurationRegistry.registerConfiguration({
+@@ -1237,3 +1237,3 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."),
 -			default: false,
 +			default: true,
@@ -61,46 +61,47 @@ index ddb5df4..7831288 100644
 + 	)
 };
 diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
-index d110a65..226b99d 100644
+index 4a71579..f8b3e83 100644
 --- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
 +++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
@@ -228,2 +228,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 						ChatContextKeys.Setup.untrusted,
 +						ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 						ChatContextKeys.Setup.installed.negate(),
-@@ -345,2 +346,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
+@@ -346,2 +347,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 							ChatContextKeys.Setup.hidden.negate(),
 +							ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 							ChatContextKeys.Setup.installed.negate(),
-@@ -512,2 +514,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
+@@ -518,2 +520,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 			ChatContextKeys.Setup.disabled.negate(),
 +			ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 			ChatContextKeys.Setup.installed.negate(),
 diff --git a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
-index 8e703e2..535b1d8 100644
+index c8fc17b..fbd2afd 100644
 --- a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
 +++ b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
-@@ -157,3 +157,3 @@ export namespace ChatContextKeyExprs {
+@@ -163,3 +163,3 @@ export namespace ChatContextKeyExprs {
 	export const chatSetupTriggerContext = ContextKeyExpr.or(
 -		ChatContextKeys.Setup.installed.negate(),
 +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 		ChatContextKeys.Entitlement.canSignUp
 diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
-index ec5ac5e..5d90045 100644
+index e9b4077..b33d6f2 100644
 --- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
 +++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
-@@ -146,3 +146,8 @@ MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
+@@ -133,3 +133,9 @@ MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
 	order: 1,
-	when: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()),
+-	when: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), ChatEntitlementContextKeys.Setup.hidden.negate()),
 +	when: ContextKeyExpr.and(
 +		EditorContextKeys.writable,
 +		EditorContextKeys.hasNonEmptySelection,
 +		CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(),
+		ChatEntitlementContextKeys.Setup.hidden.negate(),
 +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 +	),
 	command: {
 diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
-index 9e82f11..0669f45 100644
+index 864cc4f..b877a8e 100644
 --- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
 +++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
@@ -554,3 +554,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
@@ -123,10 +124,10 @@ index 8f2ea73..429e28f 100644
 +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 					ContextKeyExpr.in(ResourceContextKey.Resource.key, 'git.mergeChanges'),
 diff --git a/src/vs/workbench/contrib/scm/browser/scmInput.ts b/src/vs/workbench/contrib/scm/browser/scmInput.ts
-index bcc312c..f388856 100644
+index a35d479..da5a449 100644
 --- a/src/vs/workbench/contrib/scm/browser/scmInput.ts
 +++ b/src/vs/workbench/contrib/scm/browser/scmInput.ts
-@@ -848,2 +848,3 @@ registerAction2(class extends Action2 {
+@@ -850,2 +850,3 @@ registerAction2(class extends Action2 {
 					ChatContextKeys.Setup.disabled.negate(),
 +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
 					ChatContextKeys.Setup.installed.negate(),
--- a/patches/extensions-disable-mangler.patch
+++ b/patches/extensions-disable-mangler.patch
@@ -1,11 +0,0 @@
--- vscode-1.80.1/extensions/mangle-loader.js.old	2023-07-12 18:45:52.000000000 +0200
-+++ vscode-1.80.1/extensions/mangle-loader.js	2023-07-28 11:55:01.177444702 +0200
-@@ -37,7 +37,7 @@ function getMangledFileContents(projectP
-  * @type {webpack.LoaderDefinitionFunction}
-  */
- module.exports = async function (source, sourceMap, meta) {
-	if (this.mode !== 'production') {
-+	if (true) {
- 		// Only enable mangling in production builds
- 		return source;
- 	}
--- a/patches/feat-experimental-font.patch
+++ b/patches/feat-experimental-font.patch
@@ -1,5 +1,5 @@
 diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
-index 467b1ff..f3c5130 100644
+index e9e55ad..0ce9147 100644
 --- a/src/vs/base/browser/ui/actionbar/actionbar.css
 +++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -127 +127,72 @@
@@ -166,10 +166,10 @@ index d3dfd9a..cf59627 100644
 +}
 \ No newline at end of file
 diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
-index 827a19f..de152ec 100644
+index dc5e637..b580762 100644
 --- a/src/vs/base/browser/ui/inputbox/inputBox.css
 +++ b/src/vs/base/browser/ui/inputbox/inputBox.css
-@@ -106 +106,28 @@
+@@ -107 +107,28 @@
 }
 +
 +
@@ -222,14 +222,14 @@ index fd4d00e..92ddc99 100644
 +}
 \ No newline at end of file
 diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
-index f6c2ff1..a7da491 100644
+index b7cbca1..16f531c 100644
 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
 +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -8,2 +8,3 @@ import * as arrays from '../../../common/arrays.js';
 import { Emitter, Event } from '../../../common/event.js';
 +import { FONT } from '../../../common/font.js';
 import { KeyCode, KeyCodeUtils } from '../../../common/keyCodes.js';
-@@ -164,3 +165,3 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
+@@ -172,3 +173,3 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 	getHeight(): number {
 -		return 22;
 +		return FONT.sidebarSize22;
@@ -350,10 +350,10 @@ index 0b2fcbb..6370e6f 100644
 	}
 diff --git a/src/vs/base/common/font.ts b/src/vs/base/common/font.ts
 new file mode 100644
-index 0000000..9b2b46c
+index 0000000..8b9689c
 --- /dev/null
 +++ b/src/vs/base/common/font.ts
-@@ -0,0 +1,184 @@
+@@ -0,0 +1,187 @@
 +import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
 +
 +export const FONT = {
@@ -389,6 +389,7 @@ index 0000000..9b2b46c
 +	sidebarSize34: 34,
 +	sidebarSize39: 39,
 +	sidebarSize44: 44,
+	sidebarSize54: 54,
 +	sidebarSize62: 62,
 +	sidebarSize72: 72,
 +
@@ -431,6 +432,7 @@ index 0000000..9b2b46c
 +const SIDE_BAR_COEFF_34 = 34/13;
 +const SIDE_BAR_COEFF_39 = 39/13;
 +const SIDE_BAR_COEFF_44 = 44/13;
+const SIDE_BAR_COEFF_54 = 54/13;
 +const SIDE_BAR_COEFF_62 = 62/13;
 +const SIDE_BAR_COEFF_72 = 72/13;
 +
@@ -521,6 +523,7 @@ index 0000000..9b2b46c
 +	FONT.sidebarSize34 = size * SIDE_BAR_COEFF_34;
 +	FONT.sidebarSize39 = size * SIDE_BAR_COEFF_39;
 +	FONT.sidebarSize44 = size * SIDE_BAR_COEFF_44;
+	FONT.sidebarSize54 = size * SIDE_BAR_COEFF_54;
 +	FONT.sidebarSize62 = size * SIDE_BAR_COEFF_62;
 +	FONT.sidebarSize72 = size * SIDE_BAR_COEFF_72;
 +}
@@ -1041,7 +1044,7 @@ index 328285f..0735dfa 100644
 +		return FONT.sidebarSize22;
 	}
 diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
-index 7537f93..5a7a277 100644
+index 0d6a2da..6127a14 100644
 --- a/src/vs/workbench/browser/media/style.css
 +++ b/src/vs/workbench/browser/media/style.css
@@ -11,20 +11,20 @@
@@ -1085,8 +1088,8 @@ index 7537f93..5a7a277 100644
 	color: var(--vscode-foreground);
 +	font-family: var(--vscode-workbench-font-family, var(--monaco-font));
 +	font-size: var(--vscode-workbench-font-size, 13px);
- }
-@@ -323 +325,41 @@ body {
+ 
+@@ -335 +337,41 @@ body {
 }
 +
 +
@@ -1284,7 +1287,7 @@ index a40a351..51eb067 100644
 +}
 \ No newline at end of file
 diff --git a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
-index d903883..1bf9716 100644
+index 568a721..b3d7e50 100644
 --- a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
 +++ b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
@@ -8,2 +8,4 @@
@@ -1292,12 +1295,12 @@ index d903883..1bf9716 100644
 +	font-family: var(--vscode-workbench-activitybar-font-family, inherit);
 +	font-size: var(--vscode-workbench-activitybar-font-size);
 }
-@@ -58,3 +60,3 @@
+@@ -67,3 +69,3 @@
 	width: 100%;
 -	height: 35px;
 +	height: calc(var(--vscode-workbench-activitybar-font-size) * 2.1875);
 }
-@@ -63,3 +65,3 @@
+@@ -72,3 +74,3 @@
 	width: 100%;
 -	height: 35px;
 +	height: calc(var(--vscode-workbench-activitybar-font-size) * 2.1875);
@@ -1529,22 +1532,22 @@ index a24f761..6b15b9c 100644
 +}
 \ No newline at end of file
 diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
-index 924d9b3..70a14fd 100644
+index 4f9477d..b47fd85 100644
 --- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
 +++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
-@@ -168,4 +168,4 @@
+@@ -176,4 +176,4 @@
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fixed {
 -	min-width: var(--tab-sizing-current-width, var(--tab-sizing-fixed-min-width, 50px));
 -	max-width: var(--tab-sizing-current-width, var(--tab-sizing-fixed-max-width, 160px));
 +	min-width: 50px;
 +	max-width: 160px;
 	flex: 1 0 0; /* all tabs are evenly sized and grow */
-@@ -177,3 +177,3 @@
+@@ -185,3 +185,3 @@
 	 * of the tabs container */
 -	min-width: calc(var(--tab-sizing-current-width, var(--tab-sizing-fixed-min-width, 50px)) - 1px);
 +	min-width: 50px - 1px;
 }
-@@ -560 +560,113 @@
+@@ -568 +568,113 @@
 }
 +
 +
@@ -2058,14 +2061,14 @@ index 101b9c6..970cdaa 100644
 +
 	private registerActions(): void {
 diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
-index 7faaf9e..6cd8fbd 100644
+index 1f3b102..0075528 100644
 --- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
 +++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -11,2 +11,3 @@
 	font-size: 12px;
 +	font-family: var(--vscode-workbench-statusbar-font-family, inherit);
 	display: flex;
-@@ -236 +237,64 @@
+@@ -239 +240,64 @@
 }
 +
 +
@@ -2464,27 +2467,28 @@ index 6f58865..3ab0ee4 100644
 +		return FONT.sidebarSize22;
 	}
 diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
-index eb17488..1a005a7 100644
+index bcb46c6..0aef82b 100644
 --- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
 +++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
-@@ -45,2 +45,3 @@ import { AgentSessionProviders, getAgentSessionTime } from './agentSessions.js';
- import { AgentSessionsGrouping } from './agentSessionsFilter.js';
+@@ -52,2 +52,3 @@ import { BugIndicatingError } from '../../../../../base/common/errors.js';
+ import { ILogService } from '../../../../../platform/log/common/log.js';
 +import { FONT } from '../../../../../base/common/font.js';
 
-@@ -508,11 +509,8 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
+@@ -638,5 +639,2 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
 
 -	static readonly ITEM_HEIGHT = 54;
 -	static readonly SECTION_HEIGHT = 26;
 -
- 	getHeight(element: AgentSessionListItem): number {
+ 	constructor(private readonly _approvalModel?: AgentSessionApprovalModel) { }
+@@ -645,6 +643,6 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
 		if (isAgentSessionSection(element)) {
 -			return AgentSessionsListDelegate.SECTION_HEIGHT;
 +			return FONT.sidebarSize26;
 		}
 
-		return AgentSessionsListDelegate.ITEM_HEIGHT;
-+		return FONT.sidebarSize44;
- 	}
+-		let height = AgentSessionsListDelegate.ITEM_HEIGHT;
+		let height = FONT.sidebarSize54;
+ 		const approval = this._approvalModel?.getApproval(element.resource).get();
 diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
 index ad2c82a..6cb6bce 100644
 --- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
@@ -2525,14 +2529,14 @@ index 15ae799..06a95d5 100644
 +		return FONT.sidebarSize22;
 	}
 diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
-index 6ff8637..7694134 100644
+index 8493938..50a19e4 100644
 --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
 +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
@@ -50,2 +50,3 @@ import { IHoverService } from '../../../../../../platform/hover/browser/hover.js
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 +import { FONT } from '../../../../../../base/common/font.js';
 
-@@ -297,3 +298,3 @@ class CollapsibleListDelegate implements IListVirtualDelegate<IChatCollapsibleLi
+@@ -298,3 +299,3 @@ class CollapsibleListDelegate implements IListVirtualDelegate<IChatCollapsibleLi
 	getHeight(element: IChatCollapsibleListItem): number {
 -		return 22;
 +		return FONT.sidebarSize22;
@@ -2567,10 +2571,10 @@ index 703940e..e0fa9eb 100644
 +		return FONT.sidebarSize22;
 	}
 diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
-index f57aca1..2c34fb8 100644
+index 83799c1..b2d3db2 100644
 --- a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
 +++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
-@@ -161 +161,68 @@
+@@ -169 +169,68 @@
 }
 +
 +
@@ -2773,10 +2777,10 @@ index 531c114..909a66d 100644
 +		return FONT.sidebarSize22;
 	}
 diff --git a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
-index 090c53e..d5c4b9f 100644
+index ca34e6f..b067902 100644
 --- a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
 +++ b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
-@@ -54 +54,23 @@
+@@ -55 +55,23 @@
 }
 +
 +
@@ -3338,10 +3342,10 @@ index 530b0c4..b3c979d 100644
 +		return FONT.sidebarSize22;
 	}
 diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
-index 20c78c3..e83c322 100644
+index 408b771..7ccc6b9 100644
 --- a/src/vs/workbench/contrib/scm/browser/media/scm.css
 +++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
-@@ -799 +799,215 @@
+@@ -800 +800,215 @@
 }
 +
 +
@@ -3942,7 +3946,7 @@ index 27c6580..0feb646 100644
 +		return FONT.sidebarSize22;
 	}
 diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
-index 70191ee..42cf995 100644
+index 9e6ca13..478e4e7 100644
 --- a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
 +++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
@@ -49,3 +49,2 @@ import { AgentSessionsControl, IAgentSessionsControlOptions } from '../../chat/b
--- a/patches/fix-build-vsce.patch
+++ b/patches/fix-build-vsce.patch
@@ -16,58 +16,92 @@ index ed36151..022d6ed 100644
 +!@vscodium/vsce-sign/bin/**
 
 diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
-index a103f11..5211245 100644
+index 187726c..076f08b 100644
 --- a/build/gulpfile.vscode.ts
 +++ b/build/gulpfile.vscode.ts
-@@ -407,3 +407,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
+@@ -449,3 +449,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 				'**/*.wasm',
 -				'**/@vscode/vsce-sign/bin/*',
 +				'**/@vscodium/vsce-sign/bin/*',
 			], [
 diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
-index fac7946..a653269 100644
+index aacf25c..c4b0391 100644
 --- a/build/lib/extensions.ts
 +++ b/build/lib/extensions.ts
-@@ -125,3 +125,3 @@ export function typeCheckExtensionStream(extensionPath: string, forWeb: boolean)
- function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string, disableMangle: boolean): Stream {
-	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
-+	const vsce = require('@vscodium/vsce') as typeof import('@vscodium/vsce');
- 	const webpack = require('webpack');
-@@ -252,3 +252,3 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
+@@ -116,3 +116,3 @@ export function typeCheckExtensionStream(extensionPath: string, forWeb: boolean)
 function fromLocalNormal(extensionPath: string): Stream {
 -	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
 +	const vsce = require('@vscodium/vsce') as typeof import('@vscodium/vsce');
 	const result = es.through();
-@@ -274,3 +274,3 @@ function fromLocalNormal(extensionPath: string): Stream {
+@@ -138,3 +138,3 @@ function fromLocalNormal(extensionPath: string): Stream {
 function fromLocalEsbuild(extensionPath: string, esbuildConfigFileName: string): Stream {
 -	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
 +	const vsce = require('@vscodium/vsce') as typeof import('@vscodium/vsce');
 	const result = es.through();
 diff --git a/build/package-lock.json b/build/package-lock.json
-index 92ebc36..a610d36 100644
+index 644e16f..fac5de0 100644
 --- a/build/package-lock.json
 +++ b/build/package-lock.json
@@ -51,3 +51,3 @@
-         "@vscode/ripgrep": "^1.15.13",
+         "@vscode/ripgrep": "^1.17.1",
 -        "@vscode/vsce": "3.6.1",
 +        "@vscodium/vsce": "3.6.1-258428",
         "ansi-colors": "^3.2.3",
-@@ -2646,6 +2646,6 @@
+@@ -1941,6 +1941,45 @@
     },
 -    "node_modules/@vscode/vsce": {
 -      "version": "3.6.1",
 -      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.6.1.tgz",
 -      "integrity": "sha512-UXtMgeCBl/t5zjn1TX1v1sl5L/oIv3Xc3pkKPGzaqeFCIkp5+wfFFDBXTWDt3d5uUulHnZKORHkMIsKNe9+k5A==",
+    "node_modules/@vscode/vsce/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "extraneous": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/brace-expansion": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
+      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "extraneous": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
 +    "node_modules/@vscodium/vsce": {
 +      "version": "3.6.1-258428",
 +      "resolved": "https://registry.npmjs.org/@vscodium/vsce/-/vsce-3.6.1-258428.tgz",
 +      "integrity": "sha512-B2uys5YU5MGNmzQPHsMsRXxzlQvZanhxE8Sfkd4Sr/LBN9BaV5yhMCppV7jyLUOQajj9K3YZThLqUYm4CCBy3A==",
       "dev": true,
-@@ -2658,3 +2658,2 @@
+@@ -1953,3 +1992,2 @@
         "@secretlint/secretlint-rule-preset-recommend": "^10.1.2",
 -        "@vscode/vsce-sign": "^2.0.0",
         "azure-devops-node-api": "^12.5.0",
-@@ -2693,148 +2692,3 @@
+@@ -1988,148 +2026,3 @@
     },
 -    "node_modules/@vscode/vsce-sign": {
 -      "version": "2.0.7",
@@ -217,42 +251,52 @@ index 92ebc36..a610d36 100644
 -    "node_modules/@vscode/vsce/node_modules/ansi-styles": {
 +    "node_modules/@vscodium/vsce/node_modules/ansi-styles": {
       "version": "4.3.0",
-@@ -2854,3 +2708,3 @@
+@@ -2149,3 +2042,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/balanced-match": {
+    "node_modules/@vscodium/vsce/node_modules/balanced-match": {
+       "version": "4.0.4",
+@@ -2159,3 +2052,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/brace-expansion": {
+    "node_modules/@vscodium/vsce/node_modules/brace-expansion": {
+       "version": "5.0.4",
+@@ -2172,3 +2065,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/chalk": {
 +    "node_modules/@vscodium/vsce/node_modules/chalk": {
       "version": "4.1.2",
-@@ -2871,3 +2725,3 @@
+@@ -2189,3 +2082,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/color-convert": {
 +    "node_modules/@vscodium/vsce/node_modules/color-convert": {
       "version": "2.0.1",
-@@ -2884,3 +2738,3 @@
+@@ -2202,3 +2095,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/color-name": {
 +    "node_modules/@vscodium/vsce/node_modules/color-name": {
       "version": "1.1.4",
-@@ -2891,3 +2745,3 @@
+@@ -2209,3 +2102,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/glob": {
 +    "node_modules/@vscodium/vsce/node_modules/glob": {
       "version": "11.1.0",
-@@ -2915,3 +2769,3 @@
+@@ -2233,3 +2126,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
 +    "node_modules/@vscodium/vsce/node_modules/glob/node_modules/minimatch": {
-       "version": "10.1.1",
-@@ -2931,3 +2785,3 @@
+       "version": "10.2.4",
+@@ -2249,3 +2142,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/has-flag": {
 +    "node_modules/@vscodium/vsce/node_modules/has-flag": {
       "version": "4.0.0",
-@@ -2941,3 +2795,3 @@
+@@ -2259,3 +2152,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/jsonc-parser": {
 +    "node_modules/@vscodium/vsce/node_modules/jsonc-parser": {
       "version": "3.3.1",
-@@ -2945,9 +2799,11 @@
+@@ -2263,9 +2156,11 @@
       "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
 -      "dev": true
 +      "dev": true,
@@ -269,12 +313,12 @@ index 92ebc36..a610d36 100644
       "dev": true,
 +      "license": "ISC",
       "bin": {
-@@ -2959,3 +2815,3 @@
+@@ -2277,3 +2172,3 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/supports-color": {
 +    "node_modules/@vscodium/vsce/node_modules/supports-color": {
       "version": "7.2.0",
-@@ -2972,12 +2828,2 @@
+@@ -2290,12 +2185,2 @@
     },
 -    "node_modules/@vscode/vsce/node_modules/yazl": {
 -      "version": "2.5.1",
@@ -287,7 +331,7 @@ index 92ebc36..a610d36 100644
 -      }
 -    },
     "node_modules/@xmldom/xmldom": {
-@@ -10046,2 +9892,12 @@
+@@ -7001,2 +6886,12 @@
     },
 +    "node_modules/yazl": {
 +      "version": "2.5.1",
@@ -301,11 +345,11 @@ index 92ebc36..a610d36 100644
 +    },
     "node_modules/yocto-queue": {
 diff --git a/build/package.json b/build/package.json
-index e889b6a..6ebd757 100644
+index 8a65120..a36d5c4 100644
 --- a/build/package.json
 +++ b/build/package.json
@@ -45,3 +45,3 @@
-     "@vscode/ripgrep": "^1.15.13",
+     "@vscode/ripgrep": "^1.17.1",
 -    "@vscode/vsce": "3.6.1",
 +    "@vscodium/vsce": "3.6.1-258428",
     "ansi-colors": "^3.2.3",
--- a/patches/fix-extensions-control-connection.patch
+++ b/patches/fix-extensions-control-connection.patch
@@ -1,14 +1,14 @@
 diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
-index 594412f..52de11c 100644
+index 6414a46..0bdc5a2 100644
 --- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
 +++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
-@@ -1814,3 +1814,3 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
+@@ -1944,3 +1944,3 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 -		const context = await this.requestService.request({
 +		const requestOptions: IRequestOptions = {
 			type: 'GET',
-@@ -1818,3 +1818,9 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
- 			timeout: this.getRequestTimeout()
+@@ -1949,3 +1949,9 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
+ 			callSite: 'extensionGalleryService.getExtensionsControlManifest'
 -		}, CancellationToken.None);
 +		};
 +
--- a/patches/fix-keymap.patch
+++ b/patches/fix-keymap.patch
@@ -1,5 +1,5 @@
 diff --git a/.npmrc b/.npmrc
-index 2c7c6c1..5d5fc7d 100644
+index a275846..87f881f 100644
 --- a/.npmrc
 +++ b/.npmrc
@@ -6,2 +6,3 @@ ignore-scripts=false
@@ -24,27 +24,27 @@ index ed36151..5b040cc 100644
 +!@vscodium/native-keymap/build/Release/*.node
 
 diff --git a/eslint.config.js b/eslint.config.js
-index 29ffd56..1847a81 100644
+index 73f062a..f008259 100644
 --- a/eslint.config.js
 +++ b/eslint.config.js
-@@ -1451,3 +1451,3 @@ export default tseslint.config(
+@@ -1481,3 +1481,3 @@ export default tseslint.config(
 						'node:module',
 -						'native-keymap',
 +						'@vscodium/native-keymap',
 						'net',
 diff --git a/package-lock.json b/package-lock.json
-index bb626ac..b3e1b81 100644
+index bc72a21..ae566c1 100644
 --- a/package-lock.json
 +++ b/package-lock.json
@@ -32,2 +32,3 @@
         "@vscode/windows-registry": "^1.2.0",
 +        "@vscodium/native-keymap": "3.3.7-258424",
-         "@xterm/addon-clipboard": "^0.3.0-beta.167",
+         "@xterm/addon-clipboard": "^0.3.0-beta.191",
@@ -49,3 +50,2 @@
         "native-is-elevated": "0.9.0",
 -        "native-keymap": "^3.3.5",
         "node-pty": "^1.2.0-beta.10",
-@@ -3828,2 +3828,9 @@
+@@ -4862,2 +4862,9 @@
     },
 +    "node_modules/@vscodium/native-keymap": {
 +      "version": "3.3.7-258424",
@@ -53,8 +53,8 @@ index bb626ac..b3e1b81 100644
 +      "hasInstallScript": true,
 +      "license": "MIT"
 +    },
-     "node_modules/@webassemblyjs/ast": {
-@@ -13281,5 +13288,6 @@
+     "node_modules/@wdio/config": {
+@@ -15159,5 +15166,6 @@
     "node_modules/napi-build-utils": {
 -      "version": "1.0.2",
 -      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
@@ -64,7 +64,7 @@ index bb626ac..b3e1b81 100644
 +      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
 +      "license": "MIT"
     },
-@@ -13292,9 +13300,2 @@
+@@ -15170,9 +15178,2 @@
     },
 -    "node_modules/native-keymap": {
 -      "version": "3.3.9",
@@ -74,7 +74,7 @@ index bb626ac..b3e1b81 100644
 -      "license": "MIT"
 -    },
     "node_modules/natural-compare": {
-@@ -14717,5 +14718,6 @@
+@@ -16693,5 +16694,6 @@
     "node_modules/prebuild-install": {
 -      "version": "7.1.2",
 -      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
@@ -84,16 +84,16 @@ index bb626ac..b3e1b81 100644
 +      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
 +      "license": "MIT",
       "dependencies": {
-@@ -14726,3 +14728,3 @@
+@@ -16702,3 +16704,3 @@
         "mkdirp-classic": "^0.5.3",
 -        "napi-build-utils": "^1.0.1",
 +        "napi-build-utils": "^2.0.0",
         "node-abi": "^3.3.0",
 diff --git a/package.json b/package.json
-index 67e53ae..4e4e77c 100644
+index d727d5a..54d14ad 100644
 --- a/package.json
 +++ b/package.json
-@@ -118,3 +118,3 @@
+@@ -119,3 +119,3 @@
     "native-is-elevated": "0.9.0",
 -    "native-keymap": "^3.3.5",
 +    "@vscodium/native-keymap": "3.3.7-258424",
--- a/patches/fix-policies.patch
+++ b/patches/fix-policies.patch
@@ -1,5 +1,5 @@
 diff --git a/build/.moduleignore b/build/.moduleignore
-index ed36151..c955e07 100644
+index 5b040cc..8d5fd71 100644
 --- a/build/.moduleignore
 +++ b/build/.moduleignore
@@ -128,9 +128,11 @@ vsda/**
@@ -65,27 +65,27 @@ index 47b485d..8437fd4 100644
 +		<string>!!ORG_NAME!!</string>
 		<key>PayloadType</key>
 diff --git a/eslint.config.js b/eslint.config.js
-index 29ffd56..dff58ed 100644
+index f008259..f87fda1 100644
 --- a/eslint.config.js
 +++ b/eslint.config.js
-@@ -1434,3 +1434,3 @@ export default tseslint.config(
+@@ -1464,3 +1464,3 @@ export default tseslint.config(
 						'@vscode/native-watchdog',
 -						'@vscode/policy-watcher',
 +						'@vscodium/policy-watcher',
 						'@vscode/proxy-agent',
 diff --git a/package-lock.json b/package-lock.json
-index b3e1b81..7c34f88 100644
+index ae566c1..3b3a5dd 100644
 --- a/package-lock.json
 +++ b/package-lock.json
@@ -21,3 +21,2 @@
         "@vscode/native-watchdog": "^1.4.6",
 -        "@vscode/policy-watcher": "^1.3.2",
-         "@vscode/proxy-agent": "^0.38.0",
+         "@vscode/proxy-agent": "^0.39.1",
@@ -33,2 +32,3 @@
         "@vscodium/native-keymap": "3.3.7-258424",
 +        "@vscodium/policy-watcher": "^1.3.2-252465",
-         "@xterm/addon-clipboard": "^0.3.0-beta.167",
-@@ -3498,22 +3498,2 @@
+         "@xterm/addon-clipboard": "^0.3.0-beta.191",
+@@ -4538,22 +4538,2 @@
     },
 -    "node_modules/@vscode/policy-watcher": {
 -      "version": "1.3.7",
@@ -108,12 +108,12 @@ index b3e1b81..7c34f88 100644
 -      }
 -    },
     "node_modules/@vscode/proxy-agent": {
-@@ -3835,2 +3815,22 @@
+@@ -4869,2 +4849,22 @@
     },
 +    "node_modules/@vscodium/policy-watcher": {
-+      "version": "1.3.2-252465",
-+      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.2-252465.tgz",
-+      "integrity": "sha512-kpnb656HMteBIm8d9LhBpQ5gL2A/4rJrsaLCF0D8IWyrZAQ0UR9EzXM6tZ6p5H+KWot3QUjm0Gry6vMV1yye5Q==",
+      "version": "1.3.2-255408",
+      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.2-255408.tgz",
+      "integrity": "sha512-0KERmB+VkSz9hvFWEDGalCpxQ9+qjLaUazXMBkzWQ9SjKPaD6zU9u6wA4/OUu816JnvCFEeJYEe9WcDZPnKQ1w==",
 +      "hasInstallScript": true,
 +      "license": "MIT",
 +      "dependencies": {
@@ -122,24 +122,24 @@ index b3e1b81..7c34f88 100644
 +      }
 +    },
 +    "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
-+      "version": "8.3.0",
-+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz",
-+      "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.6.0.tgz",
+      "integrity": "sha512-gBVjCaqDlRUk0EwoPNKzIr9KkS9041G/q31IBShPs1Xz6UTA+EXdZADbzqAJQrpDRq71CIMnOP5VMut3SL0z5Q==",
 +      "license": "MIT",
 +      "engines": {
 +        "node": "^18 || ^20 || >= 21"
 +      }
 +    },
-     "node_modules/@webassemblyjs/ast": {
+     "node_modules/@wdio/config": {
 diff --git a/package.json b/package.json
-index 67e53ae..fb81b3c 100644
+index 54d14ad..47778c2 100644
 --- a/package.json
 +++ b/package.json
-@@ -90,3 +90,3 @@
+@@ -91,3 +91,3 @@
     "@vscode/native-watchdog": "^1.4.6",
 -    "@vscode/policy-watcher": "^1.3.2",
 +    "@vscodium/policy-watcher": "^1.3.2-252465",
-     "@vscode/proxy-agent": "^0.38.0",
+     "@vscode/proxy-agent": "^0.39.1",
 diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt
 index ee0a24b..881ce36 100644
 --- a/src/vs/base/test/node/uri.perf.data.txt
@@ -240,7 +240,7 @@ index ee0a24b..881ce36 100644
 +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh
 /Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md
 diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
-index c30c6da..f4f3dea 100644
+index ca6cea2..32b22fe 100644
 --- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
 +++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => {
--- a/patches/linux/fix-npm-postinstall.patch
+++ b/patches/linux/fix-npm-postinstall.patch
@@ -1,14 +1,15 @@
 diff --git a/build/npm/postinstall.ts b/build/npm/postinstall.ts
-index c4bbbf5..2a1c6c5 100644
+index ae2651c..3bc46fa 100644
 --- a/build/npm/postinstall.ts
 +++ b/build/npm/postinstall.ts
-@@ -52,5 +52,6 @@ function npmInstall(dir: string, opts?: child_process.SpawnSyncOptions) {
- 		opts.cwd = root;
+@@ -74,5 +74,7 @@ async function npmInstallAsync(dir: string, opts?: child_process.SpawnOptions):
+ 
 -		if (process.env['npm_config_arch'] === 'arm64') {
-			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
+-			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], syncOpts);
 -		}
 +		const emulateArchList = ['arm64', 'arm', 'ppc64', 'riscv64', 's390x', 'loong64'];
 +		if (process.env['DISABLE_QEMU'] !== 'true' && !!process.env['npm_config_arch'] && emulateArchList.includes(process.env['npm_config_arch'])) {
-+			run('sudo', ['docker', 'run', '--rm', '--privileged', 'tonistiigi/binfmt:latest', '--install', 'all'], opts);
+			run('sudo', ['docker', 'run', '--rm', '--privileged', 'tonistiigi/binfmt:latest', '--install', 'all'], syncOpts);
 + 		}
+
 		run('sudo', [
--- a/patches/linux/reh/s390x/package.json.patch
+++ b/patches/linux/reh/s390x/package.json.patch
@@ -1,8 +1,8 @@
 diff --git a/package-lock.json b/package-lock.json
-index fd395eb..f56bc78 100644
+index bc72a21..a875c97 100644
 --- a/package-lock.json
 +++ b/package-lock.json
-@@ -18274,6 +18274,7 @@
+@@ -20630,6 +20630,7 @@
     "node_modules/web-tree-sitter": {
 -      "version": "0.20.8",
 -      "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz",
@@ -15,12 +15,12 @@ index fd395eb..f56bc78 100644
 +      "license": "MIT"
     },
 diff --git a/package.json b/package.json
-index eb0abcc..40b107a 100644
+index d727d5a..ce7ba11 100644
 --- a/package.json
 +++ b/package.json
-@@ -226,2 +226,5 @@
-       "node-addon-api": "7.1.0"
-+    },
+@@ -231,2 +231,5 @@
+   "overrides": {
 +    "@vscode/l10n-dev@0.0.35": {
 +      "web-tree-sitter": "0.23.0"
-     }
+    },
+     "node-gyp-build": "4.8.1",
--- a/patches/sourcemaps.patch
+++ b/patches/sourcemaps.patch
@@ -1,21 +1,59 @@
-diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
-index 24462a3..1daa855 100644
--- a/build/lib/extensions.ts
-+++ b/build/lib/extensions.ts
-@@ -33,4 +33,5 @@ const require = createRequire(import.meta.url);
- const root = path.dirname(path.dirname(import.meta.dirname));
-+const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
- const commit = getVersion(root);
+diff --git a/build/gulpfile.extensions.ts b/build/gulpfile.extensions.ts
+index e013781..3caf586 100644
+--- a/build/gulpfile.extensions.ts
+++ b/build/gulpfile.extensions.ts
+@@ -26,2 +26,3 @@ import * as util from './lib/util.ts';
+ import watcher from './lib/watch/index.ts';
+import product from '../product.json' with { type: 'json' };
+ 
+@@ -100,3 +101,3 @@ const compilations = [
+ 
+-const getBaseUrl = (out: string) => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
+const getBaseUrl = (out: string) => `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/extensions-${out.replaceAll('/', '-')}`;
+ 
+diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts
+index 0ad08ab..78f17b8 100644
+--- a/build/gulpfile.reh.ts
+++ b/build/gulpfile.reh.ts
+@@ -494,3 +494,3 @@ function tweakProductForServerWeb(product: typeof import('../product.json')) {
+ 		util.rimraf(`out-vscode-${type}-min`),
+-		optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
+		optimize.minifyTask(`out-vscode-${type}`, `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/core`)
+ 	));
+diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
+index 187726c..4854af5 100644
+--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
+@@ -238,3 +238,3 @@ function runTsGoTypeCheck(): Promise<void> {
+ 
 -const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
 +const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
+ const isCI = !!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] || !!process.env['GITHUB_WORKSPACE'];
+diff --git a/build/gulpfile.vscode.web.ts b/build/gulpfile.vscode.web.ts
+index 3e6b29a..f031b99 100644
+--- a/build/gulpfile.vscode.web.ts
+++ b/build/gulpfile.vscode.web.ts
+@@ -164,3 +164,3 @@ const minifyVSCodeWebTask = task.define('minify-vscode-web-OLD', task.series(
+ 	util.rimraf('out-vscode-web-min'),
+-	optimize.minifyTask('out-vscode-web', `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
+	optimize.minifyTask('out-vscode-web', `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/core`)
+ ));
+@@ -169,3 +169,3 @@ gulp.task(minifyVSCodeWebTask);
+ // esbuild-based tasks (new)
+-const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
+const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
+ const esbuildBundleVSCodeWebTask = task.define('esbuild-vscode-web', () => runEsbuildBundle('out-vscode-web', false, true));
+diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
+index aacf25c..a62f2a7 100644
+--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
+@@ -32,4 +32,2 @@ const require = createRequire(import.meta.url);
+ const root = path.dirname(path.dirname(import.meta.dirname));
+-// const commit = getVersion(root);
+-// const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
 
-@@ -181,3 +182,3 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
- 							data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
-								return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
-+								return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions-${path.basename(extensionPath).replaceAll('/', '-')}-${relativeOutputPath.replaceAll('/', '-')}-${g1.replaceAll('/', '-')}`;
- 							}), 'utf8');
 diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
-index 58b8e07..f452614 100644
+index f5e812e..f9a4adc 100644
 --- a/build/lib/optimize.ts
 +++ b/build/lib/optimize.ts
@@ -229,3 +229,3 @@ export function bundleTask(opts: IBundleTaskOpts): () => NodeJS.ReadWriteStream
@@ -24,10 +62,10 @@ index 58b8e07..f452614 100644
 +	const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}-${f.relative.replaceAll('/', '-')}.map`) : undefined;
 	const target = getBuildTarget();
 diff --git a/build/lib/util.ts b/build/lib/util.ts
-index f1354b8..dda8c37 100644
+index 4203e6e..a01fb78 100644
 --- a/build/lib/util.ts
 +++ b/build/lib/util.ts
-@@ -285,4 +285,4 @@ export function rewriteSourceMappingURL(sourceMappingURLBase: string): NodeJS.Re
+@@ -287,4 +287,4 @@ export function rewriteSourceMappingURL(sourceMappingURLBase: string): NodeJS.Re
 			const contents = (f.contents as Buffer).toString('utf8');
 -			const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path.dirname(f.relative).replace(/\\/g, '/')}/$1`;
 -			f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
--- a/patches/use-github-pat.patch
+++ b/patches/use-github-pat.patch
@@ -1,18 +1,21 @@
 diff --git a/extensions/github-authentication/src/common/env.ts b/extensions/github-authentication/src/common/env.ts
-index ebc4749..18fd732 100644
+index 5456fb8..18fd732 100644
 --- a/extensions/github-authentication/src/common/env.ts
 +++ b/extensions/github-authentication/src/common/env.ts
-@@ -7,21 +7,4 @@ import { AuthProviderType } from '../github';
+@@ -7,24 +7,4 @@ import { AuthProviderType } from '../github';
 
 -const VALID_DESKTOP_CALLBACK_SCHEMES = [
 -	'vscode',
 -	'vscode-insiders',
+-	'vscode-exploration',
+-	'vscode-sessions',
+-	'vscode-sessions-insiders',
+-	'vscode-sessions-exploration',
 -	// On Windows, some browsers don't seem to redirect back to OSS properly.
 -	// As a result, you get stuck in the auth flow. We exclude this from the
 -	// list until we can figure out a way to fix this behavior in browsers.
 -	// 'code-oss',
 -	'vscode-wsl',
-	'vscode-exploration'
 -];
 -
 -export function isSupportedClient(uri: Uri): boolean {
@@ -26,7 +29,7 @@ index ebc4749..18fd732 100644
 +export function isSupportedClient(_uri: Uri): boolean {
 +	return false;
 }
-@@ -35,4 +18,4 @@ export function isSupportedTarget(type: AuthProviderType, gheUri?: Uri): boolean
+@@ -38,4 +18,4 @@ export function isSupportedTarget(type: AuthProviderType, gheUri?: Uri): boolean
 
 -export function isHostedGitHubEnterprise(uri: Uri): boolean {
 -	return /\.ghe\.com$/.test(uri.authority);
--- a/patches/version-1-update.patch
+++ b/patches/version-1-update.patch
@@ -1,5 +1,5 @@
 diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
-index cbeb3a6..bc382cc 100644
+index bc90a03..f8885b9 100644
 --- a/src/vs/platform/update/common/update.ts
 +++ b/src/vs/platform/update/common/update.ts
@@ -54,3 +54,4 @@ export const enum UpdateType {
@@ -49,12 +49,14 @@ index cbeb3a6..bc382cc 100644
 +	| "user";
 \ No newline at end of file
 diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
-index 3e5956f..b3685bb 100644
+index c943bca..1395594 100644
 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
 +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
-@@ -18,3 +18,3 @@ import { IProductService } from '../../product/common/productService.js';
- import { IRequestService } from '../../request/common/request.js';
+@@ -17,4 +17,4 @@ import { ILogService } from '../../log/common/log.js';
+ import { IProductService } from '../../product/common/productService.js';
+-import { IRequestService } from '../../request/common/request.js';
 -import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
+import { IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js';
 +import { Architecture, AvailableForDownload, DisablementReason, IUpdateService, Platform, State, StateType, Target, UpdateType } from '../common/update.js';
 
@@ -25,12 +25,8 @@ export interface IUpdateURLOptions {
@@ -64,32 +66,41 @@ index 3e5956f..b3685bb 100644
 -
 -	if (options?.background) {
 -		url.searchParams.set('bg', 'true');
-	}
-
-	url.searchParams.set('u', options?.internalOrg ?? 'none');
-
-	return url.toString();
 +export function createUpdateURL(productService: IProductService, quality: string, platform: Platform, architecture: Architecture, target?: Target): string {
 +	if (target) {
 +		return `${productService.updateUrl}/${quality}/${platform}/${architecture}/${target}/latest.json`;
 +	} else {
 +		return `${productService.updateUrl}/${quality}/${platform}/${architecture}/latest.json`;
-+ 	}
+ 	}
+-
+-	url.searchParams.set('u', options?.internalOrg ?? 'none');
+-
+-	return url.toString();
 }
-@@ -315,3 +311,3 @@ export abstract class AbstractUpdateService implements IUpdateService {
+@@ -322,3 +318,3 @@ export abstract class AbstractUpdateService implements IUpdateService {
 
 -		if (mode === 'none') {
 +		if (mode === 'none' || mode === 'manual') {
 			return undefined;
+@@ -336,3 +332,3 @@ export abstract class AbstractUpdateService implements IUpdateService {
+ 		try {
+-			const context = await this.requestService.request({ url, headers, callSite: 'updateService.isLatestVersion' }, token);
+			const context = await this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, token);
+ 			const statusCode = context.res.statusCode;
 diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
-index 842c676..974d411 100644
+index 40b38a2..323919e 100644
 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts
 +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
+@@ -16,3 +16,3 @@ import { ILogService } from '../../log/common/log.js';
+ import { IProductService } from '../../product/common/productService.js';
+-import { asJson, IRequestService } from '../../request/common/request.js';
+import { asJson, IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js';
+ import { ITelemetryService } from '../../telemetry/common/telemetry.js';
@@ -22,2 +22,3 @@ import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdat
 import { INodeProcess } from '../../../base/common/platform.js';
 +import * as semver from 'semver';
 
-@@ -97,16 +98,5 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
+@@ -99,15 +100,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 
 -	protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined {
 -		const assetID = this.productService.darwinUniversalAssetId ?? (process.arch === 'x64' ? 'darwin' : 'darwin-arm64');
@@ -104,19 +115,17 @@ index 842c676..974d411 100644
 -			return undefined;
 -		}
 -		return url;
-	}
 +	protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string | undefined {
 +		return createUpdateURL(this.productService, quality, process.platform, process.arch);
-+ 	}
- 
-@@ -145,3 +135,30 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
+ 	}
+@@ -154,3 +144,30 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 		this.logService.trace('update#doCheckForUpdates - using Electron autoUpdater', { url, explicit, background });
 -		electron.autoUpdater.checkForUpdates();
-+		this.requestService.request({ url }, CancellationToken.None)
+		this.requestService.request({ url, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None)
 +			.then<IUpdate | null>(asJson)
 +			.then(update => {
 +				if (!update || !update.url || !update.version || !update.productVersion) {
-+					this.setState(State.Idle(UpdateType.Setup));
+					this.setState(State.Idle(UpdateType.Setup, undefined, explicit || undefined));
 +
 +					return Promise.resolve(null);
 +				}
@@ -125,7 +134,7 @@ index 842c676..974d411 100644
 +				const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3')
 +
 +				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
-+					this.setState(State.Idle(UpdateType.Setup));
+					this.setState(State.Idle(UpdateType.Setup, undefined, explicit || undefined));
 +				}
 +				else {
 +					electron.autoUpdater.setFeedURL({ url });
@@ -141,11 +150,20 @@ index 842c676..974d411 100644
 +				this.setState(State.Idle(UpdateType.Setup, message));
 +			});
 	}
+@@ -167,3 +184,3 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
+ 		try {
+-			const context = await this.requestService.request({ url, headers, callSite: 'updateService.darwin.checkForUpdates' }, CancellationToken.None);
+			const context = await this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None);
+ 			const statusCode = context.res.statusCode;
 diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
-index 3ace29f..651b38c 100644
+index 0eb5d74..8ce708e 100644
 --- a/src/vs/platform/update/electron-main/updateService.linux.ts
 +++ b/src/vs/platform/update/electron-main/updateService.linux.ts
-@@ -16,2 +16,3 @@ import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/upda
+@@ -13,5 +13,6 @@ import { INativeHostMainService } from '../../native/electron-main/nativeHostMai
+ import { IProductService } from '../../product/common/productService.js';
+-import { asJson, IRequestService } from '../../request/common/request.js';
+import { asJson, IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js';
+ import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/update.js';
 import { AbstractUpdateService, createUpdateURL, IUpdateURLOptions } from './abstractUpdateService.js';
 +import * as semver from 'semver';
 
@@ -156,8 +174,13 @@ index 3ace29f..651b38c 100644
 +	protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string {
 +		return createUpdateURL(this.productService, quality, process.platform, process.arch);
 	}
+@@ -46,3 +47,3 @@ export class LinuxUpdateService extends AbstractUpdateService {
+ 
+-		this.requestService.request({ url, callSite: 'updateService.linux.checkForUpdates' }, CancellationToken.None)
+		this.requestService.request({ url, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None)
+ 			.then<IUpdate | null>(asJson)
@@ -51,5 +52,17 @@ export class LinuxUpdateService extends AbstractUpdateService {
- 					this.setState(State.Idle(UpdateType.Archive));
+ 					this.setState(State.Idle(UpdateType.Archive, undefined, explicit || undefined));
 -				} else {
 +
 +					return Promise.resolve(null);
@@ -167,7 +190,7 @@ index 3ace29f..651b38c 100644
 +				const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3')
 +
 +				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
-+					this.setState(State.Idle(UpdateType.Archive));
+					this.setState(State.Idle(UpdateType.Archive, undefined, explicit || undefined));
 +				}
 +				else {
 					this.setState(State.AvailableForDownload(update));
@@ -176,14 +199,17 @@ index 3ace29f..651b38c 100644
 +				return Promise.resolve(null);
 			})
 diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index 25535f2..7ef2f1b 100644
+index d02d7c3..4e8c541 100644
 --- a/src/vs/platform/update/electron-main/updateService.win32.ts
 +++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -14,3 +14,2 @@ import { CancellationToken, CancellationTokenSource } from '../../../base/common
 import { memoize } from '../../../base/common/decorators.js';
 -import { hash } from '../../../base/common/hash.js';
 import * as path from '../../../base/common/path.js';
-@@ -33,5 +32,6 @@ import { asJson, IRequestService } from '../../request/common/request.js';
+@@ -31,7 +30,8 @@ import { INativeHostMainService } from '../../native/electron-main/nativeHostMai
+ import { IProductService } from '../../product/common/productService.js';
+-import { asJson, IRequestService } from '../../request/common/request.js';
+import { asJson, IRequestService, NO_FETCH_TELEMETRY } 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, getUpdateRequestHeaders, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js';
@@ -205,12 +231,12 @@ index 25535f2..7ef2f1b 100644
 +			_updateType = UpdateType.Archive;
 +		}
 	}
-@@ -162,3 +166,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -164,3 +168,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		} else {
 -			const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
 +			const fastUpdatesEnabled = getUpdateType() === UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
 			// GC for background updates in system setup happens via inno_setup since it requires
-@@ -180,12 +184,22 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -182,12 +186,22 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 
 -	protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined {
 -		let platform = `win32-${process.arch}`;
@@ -219,7 +245,6 @@ index 25535f2..7ef2f1b 100644
 -			platform += '-archive';
 -		} else if (this.productService.target === 'user') {
 -			platform += '-user';
-		}
 +	protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string | undefined {
 +		let target: Target;
 +
@@ -237,27 +262,37 @@ index 25535f2..7ef2f1b 100644
 +				else {
 +					target = "system"
 +				}
-+ 		}
+ 		}
 
 -		return createUpdateURL(this.productService.updateUrl!, platform, quality, commit, options);
 +		return createUpdateURL(this.productService, quality, process.platform, process.arch, target);
 	}
-@@ -224,2 +238,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -209,3 +223,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 		const headers = getUpdateRequestHeaders(this.productService.version);
+-		this.requestService.request({ url, headers, callSite: 'updateService.win32.checkForUpdates' }, CancellationToken.None)
+		this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None)
+ 			.then<IUpdate | null>(asJson)
+@@ -226,2 +240,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 
 +				const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3')
 +				const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3')
 +
 +				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
-+					this.setState(State.Idle(updateType));
+					this.setState(State.Idle(updateType, undefined, explicit || undefined));
 +					return Promise.resolve(null);
 +				}
 +
 				if (updateType === UpdateType.Archive) {
-@@ -295,3 +317,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -258,3 +280,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 
+-							return this.requestService.request({ url: update.url, callSite: 'updateService.win32.downloadUpdate' }, CancellationToken.None)
+							return this.requestService.request({ url: update.url, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None)
+ 								.then(context => {
+@@ -304,3 +326,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 			.then(undefined, err => {
 -				this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) });
 				this.logService.error(err);
-@@ -359,20 +380,31 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -368,20 +389,31 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		await pfs.Promises.writeFile(this.availableUpdate.updateFilePath, 'flag');
 -		const child = spawn(this.availableUpdate.packagePath,
 -			[
--- a/product.json
+++ b/product.json
@@ -49,7 +49,6 @@
  "extensionsEnabledWithApiProposalVersion": [
    "GitHub.copilot-chat",
    "ms-vscode.vscode-commander",
-    "ms-vscode.vscode-copilot-vision",
    "GitHub.vscode-pull-request-github"
  ],
  "extensionEnabledApiProposals": {
@@ -244,10 +243,14 @@
    ],
    "GitHub.copilot": [
      "inlineCompletionsAdditions",
+      "interactive",
+      "terminalDataWriteEvent",
      "devDeviceId"
    ],
    "GitHub.copilot-nightly": [
      "inlineCompletionsAdditions",
+      "interactive",
+      "terminalDataWriteEvent",
      "devDeviceId"
    ],
    "GitHub.copilot-chat": [
@@ -377,7 +380,6 @@
      "terminalDataWriteEvent",
      "chatParticipantAdditions"
    ],
-    "vscjava.vscode-java-pack": [],
    "ms-dotnettools.csdevkit": [
      "inlineCompletionsAdditions"
    ],
@@ -398,11 +400,9 @@
    ],
    "TeamsDevApp.ms-teams-vscode-extension": [
      "chatParticipantAdditions",
-      "languageModelSystem"
+      "languageModelSystem",
+      "mcpServerDefinitions"
    ],
-    "ms-toolsai.datawrangler": [],
-    "ms-vscode.vscode-commander": [],
-    "ms-vscode.vscode-websearchforcopilot": [],
    "ms-vscode.vscode-copilot-vision": [
      "chatReferenceBinaryData",
      "codeActionAI"
@@ -410,6 +410,10 @@
    "ms-autodev.vscode-autodev": [
      "chatParticipantAdditions"
    ],
+    "codetrek.haystack-search": [
+      "fileSearchProvider",
+      "textSearchProvider2"
+    ],
    "vscjava.vscode-java-upgrade": [
      "chatParticipantAdditions",
      "chatParticipantPrivate"
--- a/upstream/insider.json
+++ b/upstream/insider.json
@@ -1,4 +1,4 @@
 {
-  "tag": "1.110.0",
-  "commit": "0870c2a0c7c0564e7631bfed2675573a94ba4455"
+  "tag": "1.112.0",
+  "commit": "2a363564b7c43022ad9fb461e2b6b8e80a80b92c"
 }