Explorar o código

feat: prepare for 1.102 (#2413)

Baptiste Augrain hai 1 día
pai
achega
6240fdfdc4

+ 2 - 2
.github/workflows/insider-linux.yml

@@ -104,7 +104,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
@@ -330,7 +330,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.DISABLED != 'yes'
 
       - name: Setup Python 3

+ 1 - 1
.github/workflows/insider-macos.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5

+ 1 - 1
.github/workflows/insider-spearhead.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
 
       - name: Clone VSCode repo
         run: . get_repo.sh

+ 3 - 3
.github/workflows/insider-windows.yml

@@ -102,7 +102,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
@@ -146,7 +146,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -183,7 +183,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3

+ 2 - 2
.github/workflows/stable-linux.yml

@@ -105,7 +105,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
@@ -331,7 +331,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.DISABLED != 'yes'
 
       - name: Setup Python 3

+ 1 - 1
.github/workflows/stable-macos.yml

@@ -61,7 +61,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5

+ 1 - 1
.github/workflows/stable-spearhead.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
 
       - name: Clone VSCode repo
         run: . get_repo.sh

+ 3 - 3
.github/workflows/stable-windows.yml

@@ -101,7 +101,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
@@ -145,7 +145,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -182,7 +182,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: '22.15.1'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3

+ 1 - 1
.nvmrc

@@ -1 +1 @@
-22.14.0
+22.15.1

+ 1 - 1
build/linux/package_reh.sh

@@ -18,7 +18,7 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 GLIBC_VERSION="2.28"
 GLIBCXX_VERSION="3.4.26"
-NODE_VERSION="22.14.0"
+NODE_VERSION="22.15.1"
 
 export VSCODE_NODEJS_URLROOT='/download/release'
 export VSCODE_NODEJS_URLSUFFIX=''

+ 42 - 97
patches/brand.patch

@@ -284,7 +284,7 @@ index af6c9d8..36e64cf 100644
 +	"json.tracing.desc": "Traces the communication between !!APP_NAME!! and the JSON language server.",
  	"json.colorDecorators.enable.desc": "Enables or disables color decorators",
 diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json
-index fe98103..ca36e86 100644
+index 45df470..0957c55 100644
 --- a/extensions/markdown-language-features/package.nls.json
 +++ b/extensions/markdown-language-features/package.nls.json
 @@ -22,3 +22,3 @@
@@ -557,7 +557,7 @@ index fc3b6ad..0675813 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 d045e6a..f9d8036 100644
+index 49ae28f..e8b81fb 100644
 --- a/src/vs/code/electron-main/app.ts
 +++ b/src/vs/code/electron-main/app.ts
 @@ -526,3 +526,3 @@ export class CodeApplication extends Disposable {
@@ -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 0a50a2e..0dacd44 100644
+index 0b2e320..a6a37d1 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
@@ -592,12 +592,12 @@ index 0a50a2e..0dacd44 100644
 -				throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", extensionId, this.productService.version));
 +				throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with !!APP_NAME!! '{1}'.", extensionId, this.productService.version));
  			}
-@@ -1028,3 +1028,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
+@@ -1065,3 +1065,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
  					} catch (e) {
 -						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 +						throw new Error(nls.localize('restartCode', "Please restart !!APP_NAME!! before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
  					}
-@@ -1039,3 +1039,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
+@@ -1076,3 +1076,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
  				} catch (e) {
 -					throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 +					throw new Error(nls.localize('restartCode', "Please restart !!APP_NAME!! before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
@@ -624,13 +624,13 @@ index ca6c82b..56fab2c 100644
 +const TERMINAL_TITLE = nls.localize('console.title', "!!APP_NAME!! Console");
  
 diff --git a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
-index 7d8d78b..d39dad4 100644
+index e5763c0..3582723 100644
 --- a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
 +++ b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
 @@ -338,3 +338,3 @@ const terminalPlatformConfiguration: IConfigurationNode = {
  			scope: ConfigurationScope.APPLICATION,
--			description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from VS Code, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."),
-+			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."),
+-			description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from VS Code, which may source a login shell to ensure $PATH and other development variables are initialized."),
++			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."),
  			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 d96926b..a787b34 100644
@@ -671,10 +671,10 @@ index 0535ddd..2478997 100644
 +	console.error('Unable to connect to !!APP_NAME!! server: ' + message);
  	console.error(err);
 diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
-index 8e931d0..919057a 100644
+index 1d3463e..fa6ac0c 100644
 --- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
 +++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
-@@ -398,3 +398,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
+@@ -454,3 +454,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
  				owner: 'TylerLeonhardt';
 -				comment: 'Used to see which extensions are using the VSCode client id override';
 +				comment: 'Used to see which extensions are using the !!APP_NAME!! client id override';
@@ -689,10 +689,10 @@ index fdf354d..b196297 100644
 +			description: localize({ key: 'vscode.extension.contributes.views.containers.id', comment: ['Contribution refers to those that an extension contributes to !!APP_NAME!! through an extension/contribution point. '] }, "Unique id used to identify the container in which views can be contributed using 'views' contribution point"),
  			type: 'string',
 diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
-index 436e350..f426464 100644
+index 12d2a2b..05e3f11 100644
 --- a/src/vs/workbench/api/common/extHostApiCommands.ts
 +++ b/src/vs/workbench/api/common/extHostApiCommands.ts
-@@ -443,3 +443,3 @@ const newCommands: ApiCommand[] = [
+@@ -436,3 +436,3 @@ const newCommands: ApiCommand[] = [
  			ApiCommandArgument.Uri.with('resource', 'Resource to open'),
 -			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 VS Code\'s default text editor'),
 +			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'),
@@ -736,24 +736,24 @@ index 0ebe271..20974b2 100644
 +		throw new Error('Unable to create the !!APP_NAME!! workbench more than once.');
  	} else {
 diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
-index 65d3aa3..1a53779 100644
+index 123df4f..89f671b 100644
 --- a/src/vs/workbench/browser/workbench.contribution.ts
 +++ b/src/vs/workbench/browser/workbench.contribution.ts
-@@ -696,3 +696,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
+@@ -698,3 +698,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
  		localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."),
 -		localize('appName', "`${appName}`: e.g. VS Code."),
 +		localize('appName', "`${appName}`: e.g. !!APP_NAME!!."),
  		localize('remoteName', "`${remoteName}`: e.g. SSH"),
 diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
-index d7b0635..76abf9a 100644
+index fff7e52..d10828d 100644
 --- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
 +++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
-@@ -146,3 +146,3 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
+@@ -145,3 +145,3 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
  
 -			const { agent, disposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Panel, undefined, context, controller);
 +			const { agent, disposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about !!APP_NAME!!").value, ChatAgentLocation.Panel, undefined, context, controller);
  			disposables.add(disposable);
-@@ -154,4 +154,4 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
+@@ -153,4 +153,4 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
  				displayName: localize('setupToolDisplayName', "New Workspace"),
 -				modelDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
 -				userDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
@@ -770,30 +770,30 @@ index 0a13063..5a342c0 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 2442c3b..b549091 100644
+index 816f372..2e74558 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
-@@ -333,3 +333,3 @@ CommandsRegistry.registerCommand({
+@@ -337,3 +337,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,
-@@ -340,3 +340,3 @@ CommandsRegistry.registerCommand({
+@@ -344,3 +344,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
-@@ -345,3 +345,3 @@ CommandsRegistry.registerCommand({
+@@ -349,3 +349,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
-@@ -350,3 +350,3 @@ CommandsRegistry.registerCommand({
+@@ -354,3 +354,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
-@@ -874,4 +874,4 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
+@@ -878,4 +878,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."),
@@ -801,39 +801,39 @@ index 2442c3b..b549091 100644
 +							: localize('InstallVSIXAction.successReload', "Completed installing extension. Please reload VSCodium to enable it."),
  						[{
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
-index 5c24f2d..fafc0d2 100644
+index 1fc3f63..c1f8609 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
-@@ -108,3 +108,3 @@ export class PromptExtensionInstallFailureAction extends Action {
+@@ -109,3 +109,3 @@ export class PromptExtensionInstallFailureAction extends Action {
  		if (this.error.name === ExtensionManagementErrorCode.Unsupported) {
 -			const productName = isWeb ? localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong;
 +			const productName = isWeb ? localize('!!APP_NAME!! for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong;
  			const message = localize('cannot be installed', "The '{0}' extension is not available in {1}. Click 'More Information' to learn more.", this.extension.displayName || this.extension.identifier.id, productName);
-@@ -553,3 +553,3 @@ export class InstallAction extends ExtensionAction {
+@@ -554,3 +554,3 @@ export class InstallAction extends ExtensionAction {
  			} else if (this.extension.deprecationInfo.settings) {
 -				detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VS Code.");
 +				detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to !!APP_NAME!!.");
  
-@@ -941,3 +941,3 @@ export class UninstallAction extends ExtensionAction {
+@@ -943,3 +943,3 @@ export class UninstallAction extends ExtensionAction {
  			await this.extensionsWorkbenchService.uninstall(this.extension);
 -			alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName));
 +			alert(localize('uninstallExtensionComplete', "Please reload !!APP_NAME!! to complete the uninstallation of the extension {0}.", this.extension.displayName));
  		} catch (error) {
-@@ -2597,3 +2597,3 @@ export class ExtensionStatusAction extends ExtensionAction {
+@@ -2599,3 +2599,3 @@ export class ExtensionStatusAction extends ExtensionAction {
  				const link = `[${localize('settings', "settings")}](${URI.parse(`command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' ')]))}`)})`;
 -				this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VS Code. Configure these {0} to use this functionality.", link)) }, true);
 +				this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to !!APP_NAME!!. Configure these {0} to use this functionality.", link)) }, true);
  			} else {
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-index 5aba80e..e7f02ed 100644
+index 752dcc3..2e99608 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-@@ -468,3 +468,3 @@ export class Extension implements IExtension {
+@@ -476,3 +476,3 @@ export class Extension implements IExtension {
  			return Promise.resolve(`# ${this.displayName || this.name}
 -**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
 +**Notice:** This extension is bundled with !!APP_NAME!!. It can be disabled but not uninstalled.
  ## Features
-@@ -506,3 +506,3 @@ ${this.description}
+@@ -514,3 +514,3 @@ ${this.description}
  		if (this.type === ExtensionType.System) {
 -			return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
 +			return Promise.resolve(`Please check the [!!APP_NAME!! Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
@@ -893,20 +893,11 @@ index b533feb..112d695 100644
 +	`// ${nls.localize('displayLanguage', 'Defines the keyboard layout used in !!APP_NAME!! in the browser environment.')}`,
 +	`// ${nls.localize('doc', 'Open !!APP_NAME!! and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.')}`,
  	``,
-diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
-index 5de0485..177e215 100644
---- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
-+++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
-@@ -561,3 +561,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
- 								},
--								"You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the VS Code Accounts menu.",
-+								"You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the !!APP_NAME!! Accounts menu.",
- 								connectionInfo.tunnelName, connectionInfo.domain, linkToOpenForMarkdown, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName, 'https://code.visualstudio.com/docs/remote/tunnels'
 diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
-index a6295cc..555a37c 100644
+index 3a66a88..63d32c3 100644
 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
 +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
-@@ -3252,3 +3252,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
+@@ -3321,3 +3321,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
  						if (response.code && response.code === TerminateResponseCode.ProcessNotFound) {
 -							this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.'));
 +							this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting !!APP_NAME!! might result in orphaned processes.'));
@@ -934,26 +925,17 @@ index e698eb9..b2a6e63 100644
 -			description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when VS Code closes with a running task.'),
 +			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/tasks/electron-sandbox/taskService.ts b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
-index 71b4a51..7c6a88f 100644
---- a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
-+++ b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
-@@ -216,3 +216,3 @@ export class TaskService extends AbstractTaskService {
- 						return this._dialogService.confirm({
--							message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting VS Code might result in orphaned processes. To avoid this start the last background process with a wait flag.'),
-+							message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting !!APP_NAME!! might result in orphaned processes. To avoid this start the last background process with a wait flag.'),
- 							primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"),
 diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
-index 42ff0ac..8f2f57c 100644
+index 01cc528..fd93677 100644
 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
 +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
-@@ -213,3 +213,3 @@ export class TerminalViewPane extends ViewPane {
+@@ -214,3 +214,3 @@ export class TerminalViewPane extends ViewPane {
  					}];
 -					this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VS Code if this is a newly installed font."), choices);
 +					this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart !!APP_NAME!! if this is a newly installed font."), choices);
  				}
 diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
-index dca86e0..3547a08 100644
+index 96f419c..47a367b 100644
 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
 +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
 @@ -314,3 +314,3 @@ const terminalConfiguration: IConfigurationNode = {
@@ -1027,7 +1009,7 @@ index a20d7ae..6861b35 100644
 +						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."),
  						buttons: [
 diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts b/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
-index d508a0d..a8f9899 100644
+index 393c8c3..9268a6c 100644
 --- a/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
 +++ b/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
 @@ -55,3 +55,3 @@ function computeTrustedDomainContent(defaultTrustedDomains: string[], trustedDom
@@ -1055,7 +1037,7 @@ index 6aa706f..ddbd93e 100644
 +				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with !!APP_NAME!! and extensions."),
  				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.readme' }, "Open the README when opening a folder that contains one, fallback to 'welcomePage' otherwise. Note: This is only observed as a global configuration, it will be ignored if set in a workspace or folder configuration."),
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index 8d72827..fb31d3a 100644
+index cc5c3bd..b7a030f 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 @@ -20,3 +20,3 @@ import { splitRecentLabel } from '../../../../base/common/labels.js';
@@ -1068,7 +1050,7 @@ index 8d72827..fb31d3a 100644
 -import { copilotSettingsMessage, NEW_WELCOME_EXPERIENCE, startEntries } from '../common/gettingStartedContent.js';
 +import { NEW_WELCOME_EXPERIENCE, startEntries } from '../common/gettingStartedContent.js';
  import { GroupDirection, GroupsOrder, IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-@@ -1618,6 +1618,2 @@ export class GettingStartedPage extends EditorPane {
+@@ -1633,6 +1633,2 @@ export class GettingStartedPage extends EditorPane {
  					multiStepContainer.appendChild(descElement);
 -					const actionMessage = $('span.action-message');
 -					const updatedText = parseLinkedText(copilotSettingsMessage);
@@ -1085,7 +1067,7 @@ index 3f1c098..26bf670 100644
 +											description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in !!APP_NAME!!.'),
  											body: 'onCommand:${1:commandId}'
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
-index 15600cc..ccd635d 100644
+index fad3c94..ccd635d 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
 @@ -15,3 +15,2 @@ import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessi
@@ -1292,7 +1274,7 @@ index 15600cc..ccd635d 100644
 -						type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions.svg'
 +						type: 'svg', altText: '!!APP_NAME!! extension marketplace with featured language extensions', path: 'extensions.svg'
  					},
-@@ -672,75 +585,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -672,66 +585,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
  	},
 -	{
 -		id: `${NEW_WELCOME_EXPERIENCE}`,
@@ -1354,16 +1336,7 @@ index 15600cc..ccd635d 100644
 -						type: 'svg', altText: 'Language extensions', path: 'languages.svg'
 -					},
 -				},
--				{
--					id: 'newSettingsAndSync',
--					title: localize('newgettingStarted.settings.title', "Customize every aspect of VS Code"),
--					description: localize('newgettingStarted.settingsAndSync.description.interpolated', "[Back up and sync](command:workbench.userDataSync.actions.turnOn) settings across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
--					when: 'syncStatus != uninitialized',
--					completionEvents: ['onEvent:sync-enabled'],
--					media: {
--						type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
--					},
--				},
+-
 -			]
 -		}
 -	}
@@ -1406,25 +1379,6 @@ index c512b64..dfa2150 100644
 -				markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VS Code. When used with `#{0}#`, you can enable the full functionality of VS Code without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES),
 +				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-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-index 4dc6cfe..71e0bb1 100644
---- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-@@ -384,3 +384,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri
- 		allowTrailingCommas: true,
--		description: 'VSCode static command line definition file',
-+		description: '!!APP_NAME!! static command line definition file',
- 		type: 'object',
-@@ -429,3 +429,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri
- 				type: 'boolean',
--				description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.")
-+				description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running !!APP_NAME!! as elevated on Linux and running under Applocker on Windows.")
- 			},
-@@ -433,3 +433,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri
- 				type: 'boolean',
--				description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.")
-+				description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running !!APP_NAME!! extension tests or when you're experiencing difficulties with the credential store.")
- 			}
 diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
 index e6805ca..f61cecc 100644
 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -1492,15 +1446,6 @@ index 859b976..06386e0 100644
 -					description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for VS Code extension. Script that gets executed when the extension is completely uninstalled from VS Code which is when VS Code is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'),
 +					description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for !!APP_NAME!! extension. Script that gets executed when the extension is completely uninstalled from !!APP_NAME!! which is when !!APP_NAME!! is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'),
  					type: 'string'
-diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
-index 0506fdc..cb3c491 100644
---- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
-+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
-@@ -167,3 +167,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
- 					[{
--						label: nls.localize('relaunch', "Relaunch VS Code"),
-+						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
 --- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts

+ 5 - 5
patches/osx/fix-emulated-urls.patch

@@ -1,8 +1,8 @@
-diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
-index 90c9654..3ef5d32 100644
---- a/src/vs/workbench/electron-sandbox/window.ts
-+++ b/src/vs/workbench/electron-sandbox/window.ts
-@@ -257,4 +257,4 @@ export class NativeWindow extends BaseWindow {
+diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
+index d507690..1abeb63 100644
+--- a/src/vs/workbench/electron-browser/window.ts
++++ b/src/vs/workbench/electron-browser/window.ts
+@@ -251,4 +251,4 @@ export class NativeWindow extends BaseWindow {
  						const quality = this.productService.quality;
 -						const stableURL = 'https://code.visualstudio.com/docs/?dv=osx';
 -						const insidersURL = 'https://code.visualstudio.com/docs/?dv=osx&build=insiders';

+ 10 - 10
patches/policies.patch

@@ -22,7 +22,7 @@ index 3e654cf..d9ee9f5 100644
 +!@vscodium/policy-watcher/build/Release/vscodium-policy-watcher.node
  
 diff --git a/build/lib/policies.js b/build/lib/policies.js
-index ac69762..db1fd3d 100644
+index b6b5200..ae80196 100644
 --- a/build/lib/policies.js
 +++ b/build/lib/policies.js
 @@ -81,3 +81,3 @@ class BasePolicy {
@@ -36,7 +36,7 @@ index ac69762..db1fd3d 100644
 +		<target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
  	</policyNamespaces>
 diff --git a/build/lib/policies.ts b/build/lib/policies.ts
-index 34d20e9..8404cdf 100644
+index 381d2f4..9cdec71 100644
 --- a/build/lib/policies.ts
 +++ b/build/lib/policies.ts
 @@ -107,3 +107,3 @@ abstract class BasePolicy implements Policy {
@@ -50,16 +50,16 @@ index 34d20e9..8404cdf 100644
 +		<target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
  	</policyNamespaces>
 diff --git a/eslint.config.js b/eslint.config.js
-index 47aebd4..6c86ef9 100644
+index dde2477..3701668 100644
 --- a/eslint.config.js
 +++ b/eslint.config.js
-@@ -801,3 +801,3 @@ export default tseslint.config(
+@@ -788,3 +788,3 @@ export default tseslint.config(
  						'@vscode/iconv-lite-umd',
 -						'@vscode/policy-watcher',
 +						'@vscodium/policy-watcher',
  						'@vscode/proxy-agent',
 diff --git a/package-lock.json b/package-lock.json
-index d0100d4..2529cad 100644
+index f86132d..5f92dd2 100644
 --- a/package-lock.json
 +++ b/package-lock.json
 @@ -18,3 +18,2 @@
@@ -69,8 +69,8 @@ index d0100d4..2529cad 100644
 @@ -29,2 +28,3 @@
          "@vscode/windows-registry": "^1.1.0",
 +        "@vscodium/policy-watcher": "^1.3.2-252465",
-         "@xterm/addon-clipboard": "^0.2.0-beta.90",
-@@ -2701,22 +2701,2 @@
+         "@xterm/addon-clipboard": "^0.2.0-beta.95",
+@@ -2943,22 +2943,2 @@
      },
 -    "node_modules/@vscode/policy-watcher": {
 -      "version": "1.3.2",
@@ -93,7 +93,7 @@ index d0100d4..2529cad 100644
 -      }
 -    },
      "node_modules/@vscode/proxy-agent": {
-@@ -3117,2 +3097,22 @@
+@@ -3361,2 +3341,22 @@
      },
 +    "node_modules/@vscodium/policy-watcher": {
 +      "version": "1.3.2-252465",
@@ -117,7 +117,7 @@ index d0100d4..2529cad 100644
 +    },
      "node_modules/@webassemblyjs/ast": {
 diff --git a/package.json b/package.json
-index 4be2f9c..657d262 100644
+index 5501dd8..f3f6b15 100644
 --- a/package.json
 +++ b/package.json
 @@ -77,3 +77,3 @@
@@ -225,7 +225,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 e0b99f3..f3af586 100644
+index 2a6acba..167d759 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)', () => {

+ 5 - 5
patches/remove-mangle.patch

@@ -1,8 +1,8 @@
 diff --git a/build/lib/compilation.js b/build/lib/compilation.js
-index 841dbe1..7cf692a 100644
+index 61a6d28..831b7c2 100644
 --- a/build/lib/compilation.js
 +++ b/build/lib/compilation.js
-@@ -148,24 +148,3 @@ function compileTask(src, out, build, options = {}) {
+@@ -145,24 +145,3 @@ function compileTask(src, out, build, options = {}) {
          }
 -        // mangle: TypeScript to TypeScript
 -        let mangleStream = event_stream_1.default.through();
@@ -28,15 +28,15 @@ index 841dbe1..7cf692a 100644
 -            .pipe(mangleStream)
              .pipe(generator.stream)
 diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
-index 6e1fcab..4e45106 100644
+index a1de9f1..084fd2f 100644
 --- a/build/lib/compilation.ts
 +++ b/build/lib/compilation.ts
 @@ -18,4 +18,2 @@ import File from 'vinyl';
  import * as task from './task';
 -import { Mangler } from './mangle/index';
 -import { RawSourceMap } from 'source-map';
- import { gulpPostcss } from './postcss';
-@@ -138,27 +136,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
+ import ts = require('typescript');
+@@ -133,27 +131,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
  
 -		// mangle: TypeScript to TypeScript
 -		let mangleStream = es.through();

+ 9 - 9
patches/report-issue.patch

@@ -1,22 +1,22 @@
-diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
-index 447f4c9..1118f18 100644
---- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
-+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
+diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
+index 46120a9..6bc88c8 100644
+--- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
++++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
 @@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
  - OS Version: \`${osVersion}\`
 -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
 +- !!APP_NAME!! version: \`${this._productService.version}\`\n\n${message}`);
  
 diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
-index 3d7653e..7dbd60b 100644
+index efe8061..831ce2e 100644
 --- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
 +++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
-@@ -665,3 +665,3 @@ export class BaseIssueReporterService extends Disposable {
+@@ -591,3 +591,3 @@ export class BaseIssueReporterService extends Disposable {
  		if (title) {
 -			this.searchDuplicates(title, issueDescription);
 +			this.searchGitHub('!!GH_REPO_PATH!!', title);
  		} else {
-@@ -757,33 +757,2 @@ export class BaseIssueReporterService extends Disposable {
+@@ -668,33 +668,2 @@ export class BaseIssueReporterService extends Disposable {
  
 -	@debounce(300)
 -	private searchDuplicates(title: string, body?: string): void {
@@ -50,14 +50,14 @@ index 3d7653e..7dbd60b 100644
 -	}
 -
  	private displaySearchResults(results: SearchResult[]) {
-@@ -879,4 +848,4 @@ export class BaseIssueReporterService extends Disposable {
+@@ -786,4 +755,4 @@ export class BaseIssueReporterService extends Disposable {
  		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
 -		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
 -		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
 +		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "!!APP_NAME!!"), false));
 +		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A !!APP_NAME!! extension"), false));
  		if (this.product.reportMarketplaceIssueUrl) {
-@@ -967,3 +936,3 @@ export class BaseIssueReporterService extends Disposable {
+@@ -874,3 +843,3 @@ export class BaseIssueReporterService extends Disposable {
  			hide(descriptionTextArea);
 -			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
 +			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of !!APP_NAME!!"));

+ 27 - 9
product.json

@@ -184,6 +184,8 @@
     ],
     "GitHub.vscode-pull-request-github": [
       "activeComment",
+      "chatParticipantAdditions",
+      "chatParticipantPrivate",
       "codiconDecoration",
       "codeActionRanges",
       "commentingRangeHint",
@@ -200,16 +202,21 @@
       "contribShareMenu",
       "diffCommand",
       "quickDiffProvider",
+      "remoteCodingAgents",
       "shareProvider",
       "tabInputTextMerge",
       "tokenInformation",
       "treeViewMarkdownMessage"
     ],
     "GitHub.copilot": [
-      "inlineCompletionsAdditions"
+      "inlineCompletionsAdditions",
+      "interactive",
+      "terminalDataWriteEvent"
     ],
     "GitHub.copilot-nightly": [
-      "inlineCompletionsAdditions"
+      "inlineCompletionsAdditions",
+      "interactive",
+      "terminalDataWriteEvent"
     ],
     "GitHub.copilot-chat": [
       "interactive",
@@ -217,14 +224,14 @@
       "terminalExecuteCommandEvent",
       "terminalSelection",
       "terminalQuickFixProvider",
+      "chatProvider",
       "chatParticipantAdditions",
       "defaultChatParticipant",
       "embeddings",
-      "chatEditing",
-      "chatProvider",
       "mappedEditsProvider",
       "aiRelatedInformation",
       "aiSettingsSearch",
+      "chatEditing",
       "codeActionAI",
       "findTextInFiles",
       "findTextInFiles2",
@@ -254,7 +261,9 @@
       "languageModelDataPart",
       "chatStatusItem",
       "taskProblemMatcherStatus",
-      "contribLanguageModelToolSets"
+      "contribLanguageModelToolSets",
+      "textDocumentChangeReason",
+      "resolvers"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",
@@ -271,6 +280,9 @@
       "textSearchProvider",
       "timeline"
     ],
+    "GitHub.copilot-nes": [
+      "inlineEdit"
+    ],
     "ms-python.gather": [
       "notebookCellExecutionState"
     ],
@@ -322,7 +334,6 @@
       "terminalDataWriteEvent",
       "chatParticipantAdditions"
     ],
-    "vscjava.vscode-java-pack": [],
     "ms-dotnettools.csdevkit": [
       "inlineCompletionsAdditions"
     ],
@@ -341,16 +352,23 @@
       "chatParticipantAdditions",
       "languageModelSystem"
     ],
-    "ms-toolsai.datawrangler": [],
-    "ms-vscode.vscode-commander": [],
-    "ms-vscode.vscode-websearchforcopilot": [],
     "ms-vscode.vscode-copilot-vision": [
       "chatReferenceBinaryData",
       "codeActionAI"
     ],
+    "lramos15.model-playground": [
+      "chatProvider"
+    ],
     "ms-autodev.vscode-autodev": [
       "chatParticipantAdditions"
     ],
+    "codetrek.haystack-search": [
+      "fileSearchProvider",
+      "textSearchProvider2"
+    ],
+    "vscjava.vscode-java-upgrade": [
+      "chatParticipantAdditions"
+    ],
     "jeanp413.open-remote-ssh": [
       "resolvers",
       "tunnels",

+ 2 - 2
upstream/insider.json

@@ -1,4 +1,4 @@
 {
-  "tag": "1.101.0",
-  "commit": "dfaf44141ea9deb3b4096f7cd6d24e00c147a4b1"
+  "tag": "1.102.0",
+  "commit": "28d57516d00e818edf89848fc36a8c97fa882e58"
 }