@codingame/monaco-vscode-extensions-service-override 23.3.0 → 24.1.0

package/vscode/src/vs/workbench/services/extensions/browser/extensionService.d.ts

@@ -13,7 +13,7 @@ import { IRemoteExtensionsScannerService } from "@codingame/monaco-vscode-api/vs
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import { IWebExtensionsScannerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
 import { IWorkbenchExtensionEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
 import { IWorkbenchExtensionManagementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
@@ -22,7 +22,7 @@ import { AbstractExtensionService, IExtensionHostFactory, ResolvedExtensions } f
 import { ExtensionDescriptionRegistrySnapshot } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionDescriptionRegistry";
 import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind";
 import { IExtensionManifestPropertiesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service";
-import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ExtensionRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ExtensionRunningLocationTracker } from "../common/extensionRunningLocationTracker.js";
 import { IExtensionHost } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";

package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js

@@ -1,24 +1,24 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
-import { Schemas, FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { getLogs } from '@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common/vscode/vs/platform/log/browser/log';
+import { getLogs } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/browser/log';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { PersistentConnectionEventType } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/platform/remote/common/remoteAgentConnection';
+import { PersistentConnectionEventType } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAgentConnection';
 import { RemoteAuthorityResolverError } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteAuthorityResolverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { IRemoteExtensionsScannerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteExtensionsScanner.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { WebWorkerExtensionHost } from './webWorkerExtensionHost.js';
 import { FetchFileSystemProvider } from './webWorkerFileSystemProvider.js';
@@ -181,7 +181,7 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
                 const startup = (isInitialStart
                     ? ExtensionHostStartup.EagerManualStart
                     : ExtensionHostStartup.EagerAutoStart);
-                return this._instantiationService.createInstance(WebWorkerExtensionHost, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart), ( ( FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorkerMain.js')).toString(true)), { type: 'module' });
+                return this._instantiationService.createInstance(WebWorkerExtensionHost, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
             case ExtensionHostKind.Remote: {
                 const remoteAgentConnection = this._remoteAgentService.getConnection();

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IMessagePassingProtocol } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc";
+import { IMessagePassingProtocol } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
 import { ILoggerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
@@ -9,9 +9,10 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
+import { IWebWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
-import { LocalWebWorkerRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { LocalWebWorkerRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 export interface IWebWorkerExtensionHostInitData {
     readonly extensions: ExtensionHostExtensions;
@@ -23,8 +24,6 @@ export declare class WebWorkerExtensionHost extends Disposable implements IExten
     readonly runningLocation: LocalWebWorkerRunningLocation;
     readonly startup: ExtensionHostStartup;
     private readonly _initDataProvider;
-    private readonly workerUrl;
-    private readonly workerOptions;
     private readonly _telemetryService;
     private readonly _contextService;
     private readonly _labelService;
@@ -35,6 +34,7 @@ export declare class WebWorkerExtensionHost extends Disposable implements IExten
     private readonly _productService;
     private readonly _layoutService;
     private readonly _storageService;
+    private readonly _webWorkerService;
     readonly pid: null;
     readonly remoteAuthority: null;
     extensions: ExtensionHostExtensions | null;
@@ -47,7 +47,7 @@ export declare class WebWorkerExtensionHost extends Disposable implements IExten
     private _protocolPromise;
     private _protocol;
     private readonly _extensionHostLogsLocation;
-    constructor(runningLocation: LocalWebWorkerRunningLocation, startup: ExtensionHostStartup, _initDataProvider: IWebWorkerExtensionHostDataProvider, workerUrl: string, workerOptions: WorkerOptions | undefined, _telemetryService: ITelemetryService, _contextService: IWorkspaceContextService, _labelService: ILabelService, _logService: ILogService, _loggerService: ILoggerService, _environmentService: IBrowserWorkbenchEnvironmentService, _userDataProfilesService: IUserDataProfilesService, _productService: IProductService, _layoutService: ILayoutService, _storageService: IStorageService);
+    constructor(runningLocation: LocalWebWorkerRunningLocation, startup: ExtensionHostStartup, _initDataProvider: IWebWorkerExtensionHostDataProvider, _telemetryService: ITelemetryService, _contextService: IWorkspaceContextService, _labelService: ILabelService, _logService: ILogService, _loggerService: ILoggerService, _environmentService: IBrowserWorkbenchEnvironmentService, _userDataProfilesService: IUserDataProfilesService, _productService: IProductService, _layoutService: ILayoutService, _storageService: IStorageService, _webWorkerService: IWebWorkerService);
     protected _getWebWorkerExtensionHostIframeSrc(): Promise<string>;
     start(): Promise<IMessagePassingProtocol>;
     private _startInsideIframe;

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js

@@ -23,21 +23,21 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { isLoggingOnly } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
+import { WebWorkerDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerDescriptor';
+import { IWebWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service';
 import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { ExtensionHostExitCode, isMessageOfType, MessageType, createMessageOfType, UIKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
 import { ExtensionHostStartup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { getNLSLanguage, getNLSMessages } from '@codingame/monaco-vscode-api/vscode/vs/nls.messages';
 
 let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
-    constructor(runningLocation, startup, _initDataProvider, workerUrl, workerOptions, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService) {
+    constructor(runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService, _webWorkerService) {
         super();
         this.runningLocation = runningLocation;
         this.startup = startup;
         this._initDataProvider = _initDataProvider;
-        this.workerUrl = workerUrl;
-        this.workerOptions = workerOptions;
         this._telemetryService = _telemetryService;
         this._contextService = _contextService;
         this._labelService = _labelService;
@@ -48,6 +48,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         this._productService = _productService;
         this._layoutService = _layoutService;
         this._storageService = _storageService;
+        this._webWorkerService = _webWorkerService;
         this.pid = null;
         this.remoteAuthority = null;
         this.extensions = null;
@@ -88,8 +89,12 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 return ( res.toString());
             }
         }
-        const relativeExtensionHostIframeSrc = ( FileAccess.asBrowserUri(iframeModulePath));
-        return `${( relativeExtensionHostIframeSrc.toString(true))}${suffix}`;
+        const relativeExtensionHostIframeSrc = this._webWorkerService.getWorkerUrl(( new WebWorkerDescriptor({
+            esmModuleLocation: ( FileAccess.asBrowserUri(iframeModulePath)),
+            esmModuleLocationBundler: ( new URL(`../worker/webWorkerExtensionHostIframe.html`, import.meta.url)),
+            label: 'webWorkerExtensionHostIframe'
+        })));
+        return `${relativeExtensionHostIframeSrc}${suffix}`;
     }
     async start() {
         if (!this._protocolPromise) {
@@ -104,7 +109,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         const iframe = createElement('iframe');
         iframe.setAttribute('class', 'web-worker-ext-host-iframe');
         iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin');
-        iframe.setAttribute('allow', 'usb; serial; hid; cross-origin-isolated;');
+        iframe.setAttribute('allow', 'usb; serial; hid; cross-origin-isolated; local-network-access;');
         iframe.setAttribute('aria-hidden', 'true');
         iframe.style.display = 'none';
         const vscodeWebWorkerExtHostId = generateUuid();
@@ -149,8 +154,8 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 iframe.contentWindow.postMessage({
                     type: event.data.type,
                     data: {
-                        workerUrl: this.workerUrl,
-                        workerOptions: this.workerOptions,
+                        workerUrl: this._webWorkerService.getWorkerUrl(extensionHostWorkerMainDescriptor),
+                        workerOptions: this._webWorkerService.getWorkerOptions(extensionHostWorkerMainDescriptor),
                         fileRoot: globalThis._VSCODE_FILE_ROOT,
                         nls: {
                             messages: getNLSMessages(),
@@ -285,16 +290,25 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
     }
 };
 WebWorkerExtensionHost = ( __decorate([
-    ( __param(5, ITelemetryService)),
-    ( __param(6, IWorkspaceContextService)),
-    ( __param(7, ILabelService)),
-    ( __param(8, ILogService)),
-    ( __param(9, ILoggerService)),
-    ( __param(10, IBrowserWorkbenchEnvironmentService)),
-    ( __param(11, IUserDataProfilesService)),
-    ( __param(12, IProductService)),
-    ( __param(13, ILayoutService)),
-    ( __param(14, IStorageService))
+    ( __param(3, ITelemetryService)),
+    ( __param(4, IWorkspaceContextService)),
+    ( __param(5, ILabelService)),
+    ( __param(6, ILogService)),
+    ( __param(7, ILoggerService)),
+    ( __param(8, IBrowserWorkbenchEnvironmentService)),
+    ( __param(9, IUserDataProfilesService)),
+    ( __param(10, IProductService)),
+    ( __param(11, ILayoutService)),
+    ( __param(12, IStorageService)),
+    ( __param(13, IWebWorkerService))
 ], WebWorkerExtensionHost));
+const extensionHostWorkerMainDescriptor = ( new WebWorkerDescriptor({
+    label: 'extensionHostWorkerMain',
+    esmModuleLocation: () => ( FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorkerMain.js')),
+    esmModuleLocationBundler: () => ( new URL(
+        '../../../api/worker/extensionHostWorkerMain.ts?workerModule',
+        import.meta.url
+    )),
+}));
 
 export { WebWorkerExtensionHost };

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts

@@ -19,7 +19,7 @@ import { ExtensionDescriptionRegistrySnapshot, IActivationEventsReader } from "@
 import { ExtensionHostKind, IExtensionHostKindPicker } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind";
 import { IExtensionHostManager } from "./extensionHostManagers.js";
 import { IExtensionManifestPropertiesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service";
-import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ExtensionRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ExtensionRunningLocationTracker } from "./extensionRunningLocationTracker.js";
 import { ActivationKind, ActivationTimes, ExtensionActivationReason, ExtensionPointContribution, IExtensionHost, IExtensionInspectInfo, IExtensionsStatus, IMessage, IResponsiveStateChangeEvent, IWillActivateEvent, WillStopExtensionHostsEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -39,7 +39,7 @@ import { parseExtensionDevOptions } from './extensionDevOptions.js';
 import { ExtensionRunningPreference, ExtensionHostKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { ExtensionHostManager } from './extensionHostManager.js';
 import { IExtensionManifestPropertiesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
-import { RemoteRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from '@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
+import { RemoteRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
 import { ExtensionRunningLocationTracker, filterExtensionIdentifiers } from './extensionRunningLocationTracker.js';
 import { toExtensionDescription, ExtensionHostStartup, ActivationKind, ExtensionPointContribution, ActivationTimes, toExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry, ExtensionMessageCollector } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
@@ -181,14 +181,14 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                     }
                 }, {
                     id: 'join.disconnectRemote',
-                    label: ( localize(13798, "Disconnect Remote Agent")),
+                    label: ( localize(13940, "Disconnect Remote Agent")),
                     order: WillShutdownJoinerOrder.Last
                 });
             }
             else {
                 event.join(this._doStopExtensionHosts(), {
                     id: 'join.stopExtensionHosts',
-                    label: ( localize(13799, "Stopping Extension Hosts")),
+                    label: ( localize(13941, "Stopping Extension Hosts")),
                 });
             }
         }));
@@ -259,7 +259,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    13800,
+                    13942,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( result.removedDueToLooping.map(e => `'${e.identifier.value}'`)).join(', ')
                 ))
@@ -434,7 +434,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    13800,
+                    13942,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( result.removedDueToLooping.map(e => `'${e.identifier.value}'`)).join(', ')
                 ))
@@ -449,7 +449,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const extensionHostManager = this.findTestExtensionHost(this._environmentService.extensionTestsLocationURI);
         if (!extensionHostManager) {
             const msg = ( localize(
-                13801,
+                13943,
                 "No extension host found that can launch the test runner at {0}.",
                 (this._environmentService.extensionTestsLocationURI.toString())
             ));
@@ -619,7 +619,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                             vetoReasons.add(reason);
                         }
                     }).catch(error => {
-                        vetoReasons.add(( localize(13802, "{0} (Error: {1})", reason, toErrorMessage(error))));
+                        vetoReasons.add(( localize(13944, "{0} (Error: {1})", reason, toErrorMessage(error))));
                     });
                 }
             }
@@ -634,11 +634,11 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                 this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
                 const { confirmed } = await this._dialogService.confirm({
                     type: Severity.Warning,
-                    message: ( localize(13803, "Please confirm restart of extensions.")),
+                    message: ( localize(13945, "Please confirm restart of extensions.")),
                     detail: vetoReasonsArray.length === 1 ?
                         vetoReasonsArray[0] :
                         vetoReasonsArray.join('\n -'),
-                    primaryButton: ( localize(13804, "Restart Anyway"))
+                    primaryButton: ( localize(13946, "Restart Anyway"))
                 });
                 if (confirmed) {
                     return true;
@@ -735,15 +735,15 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._remoteCrashTracker.registerCrash();
             if (this._remoteCrashTracker.shouldAutomaticallyRestart()) {
                 this._logService.info(`Automatically restarting the remote extension host.`);
-                this._notificationService.status(( localize(13805, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
+                this._notificationService.status(( localize(13947, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
                 this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
             }
             else {
                 this._notificationService.prompt(Severity.Error, ( localize(
-                    13806,
+                    13948,
                     "Remote Extension host terminated unexpectedly 3 times within the last 5 minutes."
                 )), [{
-                        label: ( localize(13807, "Restart Remote Extension Host")),
+                        label: ( localize(13949, "Restart Remote Extension Host")),
                         run: () => {
                             this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
                         }
@@ -1250,7 +1250,7 @@ class ActivationFeatureMarkdowneRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'activationEvents',
-    label: ( localize(13808, "Activation Events")),
+    label: ( localize(13950, "Activation Events")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extHostCustomers.d.ts

@@ -11,7 +11,7 @@ export interface IExtHostContext extends IRPCProtocol {
 export interface IInternalExtHostContext extends IExtHostContext {
     readonly internalExtensionService: IInternalExtensionService;
     _setExtensionHostProxy(extensionHostProxy: IExtensionHostProxy): void;
-    _setAllMainProxyIdentifiers(mainProxyIdentifiers: ProxyIdentifier<any>[]): void;
+    _setAllMainProxyIdentifiers(mainProxyIdentifiers: ProxyIdentifier<unknown>[]): void;
 }
 export type IExtHostNamedCustomer<T extends IDisposable> = [
     ProxyIdentifier<T>,

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.d.ts

@@ -10,7 +10,7 @@ import { ExtensionHostKind } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IExtensionHostManager } from "./extensionHostManagers.js";
 import { IExtensionDescriptionDelta } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProtocol";
 import { IResolveAuthorityResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProxy";
-import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ExtensionRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionHost, IExtensionInspectInfo, IInternalExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { ResponsiveState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/rpcProtocol";
 export declare class ExtensionHostManager extends Disposable implements IExtensionHostManager {

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js

@@ -479,7 +479,7 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
     constructor() {
         super({
             id: 'editor.action.measureExtHostLatency',
-            title: ( localize2(13809, "Measure Extension Host Latency")),
+            title: ( localize2(13951, "Measure Extension Host Latency")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts

@@ -4,7 +4,7 @@ import { ExtensionIdentifier, IExtensionDescription } from "@codingame/monaco-vs
 import { ExtensionHostKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind";
 import { IExtensionDescriptionDelta } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProtocol";
 import { IResolveAuthorityResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProxy";
-import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ExtensionRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionInspectInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { ResponsiveState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/rpcProtocol";
 export interface IExtensionHostManager {

package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.d.ts

@@ -7,7 +7,7 @@ import { IReadOnlyExtensionDescriptionRegistry } from "@codingame/monaco-vscode-
 import { ExtensionHostKind, IExtensionHostKindPicker } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind";
 import { IExtensionHostManager } from "./extensionHostManagers.js";
 import { IExtensionManifestPropertiesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service";
-import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ExtensionRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 export declare class ExtensionRunningLocationTracker {
     private readonly _registry;
     private readonly _extensionHostKindPicker;

package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js

@@ -7,7 +7,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { determineExtensionHostKinds, ExtensionHostKind, ExtensionRunningPreference } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { IExtensionManifestPropertiesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
-import { RemoteRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from '@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
+import { RemoteRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
 
 let ExtensionRunningLocationTracker = class ExtensionRunningLocationTracker {
     get maxLocalProcessAffinity() {

package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js

@@ -106,7 +106,7 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'enabledApiProposals',
-    label: ( localize(13810, "API Proposals")),
+    label: ( localize(13952, "API Proposals")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js

@@ -9,7 +9,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         const extension = result.get(systemExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                13898,
+                14039,
                 "Overwriting extension {0} with {1}.",
                 extension.extensionLocation.fsPath,
                 systemExtension.extensionLocation.fsPath
@@ -29,7 +29,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
             }
             else {
                 logService.warn(( localize(
-                    13898,
+                    14039,
                     "Overwriting extension {0} with {1}.",
                     extension.extensionLocation.fsPath,
                     userExtension.extensionLocation.fsPath
@@ -46,7 +46,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         const extension = result.get(workspaceExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                13899,
+                14040,
                 "Overwriting {0} with Workspace Extension {1}.",
                 extension.extensionLocation.fsPath,
                 workspaceExtension.extensionLocation.fsPath
@@ -56,7 +56,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
     });
     development.forEach(developedExtension => {
         logService.info(( localize(
-            13900,
+            14041,
             "Loading development extension at {0}",
             developedExtension.extensionLocation.fsPath
         )));

package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.d.ts

@@ -8,7 +8,7 @@ import { ExtensionHostKind } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IExtensionHostManager } from "./extensionHostManagers.js";
 import { IExtensionDescriptionDelta } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProtocol";
 import { IResolveAuthorityResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProxy";
-import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ExtensionRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionHost, IExtensionInspectInfo, IInternalExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { ResponsiveState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/rpcProtocol";
 /**

package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IMessagePassingProtocol } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc";
+import { IMessagePassingProtocol } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc";
 import { IExtensionHostDebugService } from "@codingame/monaco-vscode-api/vscode/vs/platform/debug/common/extensionHostDebug.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILoggerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
@@ -14,7 +14,7 @@ import { ISignService } from "@codingame/monaco-vscode-api/vscode/vs/platform/si
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
-import { RemoteRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { RemoteRunningLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 export interface IRemoteExtensionHostInitData {
     readonly connectionData: IRemoteConnectionData | null;

package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.js

@@ -9,7 +9,7 @@ import { IExtensionHostDebugService } from '@codingame/monaco-vscode-api/vscode/
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ILogService, ILoggerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { connectRemoteAgentExtensionHost } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/platform/remote/common/remoteAgentConnection';
+import { connectRemoteAgentExtensionHost } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAuthorityResolverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { IRemoteSocketFactoryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
 import { ISignService } from '@codingame/monaco-vscode-api/vscode/vs/platform/sign/common/sign.service';

package/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html

@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-O8NK++6jfjVooqQN8mkcEKUM19Yc4nx5RZXws6U2sao=' data: extension-file: https: http://localhost:* blob:;
+			script-src 'self' 'unsafe-eval' 'sha256-YenIR0w2uOJMq12UhbL15PlQWd7gf4v3ThVTe/nvZZE=' data: extension-file: https: http://localhost:* blob:;
 			connect-src 'self' data: extension-file: https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
 	</head>
 	<body>
@@ -102,7 +102,7 @@
 				`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(nlsMessages)};`,
 				`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(nlsLanguage)};`,
 				`globalThis._VSCODE_FILE_ROOT = ${JSON.stringify(fileRoot)};`,
-				(workerOptions.type === 'module') ? `await import('${workerUrl}');` : `importScripts('${workerUrl}');`,
+				(workerOptions?.type === 'module') ? `await import('${workerUrl}');` : `importScripts('${workerUrl}');`,
 				`/*extensionHostWorker*/`
 			].join('')], { type: 'application/javascript' });