npm - @codingame/monaco-vscode-remote-agent-service-override - Versions diffs - 5.2.0 → 6.0.0 - Mend

@codingame/monaco-vscode-remote-agent-service-override 5.2.0 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-remote-agent-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0",
-    "@codingame/monaco-vscode-environment-service-override": "5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "6.0.0"
   }
 }

package/remoteAgent.js CHANGED Viewed

@@ -26,6 +26,7 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale.service';
 import { ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel.service';
 import { TunnelService } from './vscode/src/vs/workbench/services/tunnel/browser/tunnelService.js';
+import { IWorkbenchExtensionManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import getServiceOverride$1 from '@codingame/monaco-vscode-environment-service-override';
 import { getWorkbenchConstructionOptions } from 'vscode/workbench';
 import { registerServiceInitializePreParticipant } from 'vscode/lifecycle';
@@ -58,8 +59,8 @@ InjectedRemoteAuthorityResolverService = __decorate([
     ( __param(3, IFileService))
 ], InjectedRemoteAuthorityResolverService);
 let CustomRemoteExtensionsScannerService = class CustomRemoteExtensionsScannerService extends RemoteExtensionsScannerService {
-    constructor(scanRemoteExtensions, remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, logService, activeLanguagePackService) {
-        super(remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, logService, activeLanguagePackService);
+    constructor(scanRemoteExtensions, remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, activeLanguagePackService, extensionManagementService, logService) {
+        super(remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, activeLanguagePackService, extensionManagementService, logService);
         this.scanRemoteExtensions = scanRemoteExtensions;
     }
     async scanExtensions() {
@@ -74,8 +75,9 @@ CustomRemoteExtensionsScannerService = __decorate([
     ( __param(2, IWorkbenchEnvironmentService)),
     ( __param(3, IUserDataProfileService)),
     ( __param(4, IRemoteUserDataProfilesService)),
-    ( __param(5, ILogService)),
-    ( __param(6, IActiveLanguagePackService))
+    ( __param(5, IActiveLanguagePackService)),
+    ( __param(6, IWorkbenchExtensionManagementService)),
+    ( __param(7, ILogService))
 ], CustomRemoteExtensionsScannerService);
 registerServiceInitializePreParticipant(async (serviceAccessor) => {
     RemoteFileSystemProviderClient.register(serviceAccessor.get(IRemoteAgentService), serviceAccessor.get(IFileService), serviceAccessor.get(ILogService));

package/vscode/src/vs/platform/files/common/diskFileSystemProviderClient.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { newWriteableStream } from 'vscode/vscode/vs/base/common/stream';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
-import { createFileSystemProviderError, FileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileSystemProviderCapabilities, createFileSystemProviderError, FileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
 import { reviveFileChanges } from 'vscode/vscode/vs/platform/files/common/watcher';
 class DiskFileSystemProviderClient extends Disposable {
@@ -24,20 +24,20 @@ class DiskFileSystemProviderClient extends Disposable {
     get capabilities() {
         if (!this._capabilities) {
             this._capabilities =
-                2  |
-                    4  |
-                    16  |
-                    8  |
-                    8192  |
-                    16384  |
-                    32768  |
-                    65536  |
-                    131072 ;
+                FileSystemProviderCapabilities.FileReadWrite |
+                    FileSystemProviderCapabilities.FileOpenReadWriteClose |
+                    FileSystemProviderCapabilities.FileReadStream |
+                    FileSystemProviderCapabilities.FileFolderCopy |
+                    FileSystemProviderCapabilities.FileWriteUnlock |
+                    FileSystemProviderCapabilities.FileAtomicRead |
+                    FileSystemProviderCapabilities.FileAtomicWrite |
+                    FileSystemProviderCapabilities.FileAtomicDelete |
+                    FileSystemProviderCapabilities.FileClone;
             if (this.extraCapabilities.pathCaseSensitive) {
-                this._capabilities |= 1024 ;
+                this._capabilities |= FileSystemProviderCapabilities.PathCaseSensitive;
             }
             if (this.extraCapabilities.trash) {
-                this._capabilities |= 4096 ;
+                this._capabilities |= FileSystemProviderCapabilities.Trash;
             }
         }
         return this._capabilities;

package/vscode/src/vs/platform/remote/browser/browserSocketFactory.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { SocketDiagnostics } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';
+import { SocketDiagnostics, SocketDiagnosticsEventType, SocketCloseEventType } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';
 import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
@@ -23,7 +23,7 @@ class BrowserWebSocket extends Disposable {
         this.onError = this._onError.event;
         this._debugLabel = debugLabel;
         this._socket = ( new WebSocket(url));
-        this.traceSocketEvent("created" , { type: 'BrowserWebSocket', url });
+        this.traceSocketEvent(SocketDiagnosticsEventType.Created, { type: 'BrowserWebSocket', url });
         this._fileReader = ( new FileReader());
         this._queue = [];
         this._isReading = false;
@@ -31,7 +31,7 @@ class BrowserWebSocket extends Disposable {
         this._fileReader.onload = (event) => {
             this._isReading = false;
             const buff = event.target.result;
-            this.traceSocketEvent("read" , buff);
+            this.traceSocketEvent(SocketDiagnosticsEventType.Read, buff);
             this._onData.fire(buff);
             if (this._queue.length > 0) {
                 enqueue(this._queue.shift());
@@ -47,12 +47,12 @@ class BrowserWebSocket extends Disposable {
         };
         this._socketMessageListener = (ev) => {
             const blob = ev.data;
-            this.traceSocketEvent("browserWebSocketBlobReceived" , { type: blob.type, size: blob.size });
+            this.traceSocketEvent(SocketDiagnosticsEventType.BrowserWebSocketBlobReceived, { type: blob.type, size: blob.size });
             enqueue(blob);
         };
         this._socket.addEventListener('message', this._socketMessageListener);
         this._register(addDisposableListener(this._socket, 'open', (e) => {
-            this.traceSocketEvent("open" );
+            this.traceSocketEvent(SocketDiagnosticsEventType.Open);
             this._onOpen.fire();
         }));
         let pendingErrorEvent = null;
@@ -73,7 +73,7 @@ class BrowserWebSocket extends Disposable {
             sendPendingErrorNow();
         };
         this._register(addDisposableListener(this._socket, 'close', (e) => {
-            this.traceSocketEvent("close" , { code: e.code, reason: e.reason, wasClean: e.wasClean });
+            this.traceSocketEvent(SocketDiagnosticsEventType.Close, { code: e.code, reason: e.reason, wasClean: e.wasClean });
             this._isClosed = true;
             if (pendingErrorEvent) {
                 if (!navigator.onLine) {
@@ -100,7 +100,7 @@ class BrowserWebSocket extends Disposable {
             this._onClose.fire({ code: e.code, reason: e.reason, wasClean: e.wasClean, event: e });
         }));
         this._register(addDisposableListener(this._socket, 'error', (err) => {
-            this.traceSocketEvent("error" , { message: err?.message });
+            this.traceSocketEvent(SocketDiagnosticsEventType.Error, { message: err?.message });
             sendErrorSoon(err);
         }));
     }
@@ -108,12 +108,12 @@ class BrowserWebSocket extends Disposable {
         if (this._isClosed) {
             return;
         }
-        this.traceSocketEvent("write" , data);
+        this.traceSocketEvent(SocketDiagnosticsEventType.Write, data);
         this._socket.send(data);
     }
     close() {
         this._isClosed = true;
-        this.traceSocketEvent("close" );
+        this.traceSocketEvent(SocketDiagnosticsEventType.Close);
         this._socket.close();
         this._socket.removeEventListener('message', this._socketMessageListener);
         this.dispose();
@@ -150,7 +150,7 @@ class BrowserSocket {
             }
             else {
                 listener({
-                    type: 1 ,
+                    type: SocketCloseEventType.WebSocketCloseEvent,
                     code: e.code,
                     reason: e.reason,
                     wasClean: e.wasClean,

package/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.js CHANGED Viewed

@@ -9,7 +9,7 @@ import { mark } from 'vscode/vscode/vs/base/common/performance';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { getRemoteAuthorityPrefix, WebSocketRemoteConnection } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
+import { getRemoteAuthorityPrefix, WebSocketRemoteConnection, RemoteConnectionType } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { parseAuthorityWithOptionalPort } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extends Disposable {
@@ -78,7 +78,7 @@ let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extend
     _setResolvedAuthority(resolvedAuthority, options) {
         if (( this._resolveAuthorityRequests.has(resolvedAuthority.authority))) {
             const request = this._resolveAuthorityRequests.get(resolvedAuthority.authority);
-            if (resolvedAuthority.connectTo.type === 0 ) {
+            if (resolvedAuthority.connectTo.type === RemoteConnectionType.WebSocket) {
                 RemoteAuthorities.set(resolvedAuthority.authority, resolvedAuthority.connectTo.host, resolvedAuthority.connectTo.port);
             }
             if (resolvedAuthority.connectionToken) {

package/vscode/src/vs/workbench/contrib/remote/browser/explorerViewItems.js CHANGED Viewed

@@ -4,6 +4,7 @@ import { REMOTE_EXPLORER_TYPE_KEY } from 'vscode/vscode/vs/workbench/services/re
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
 import { isStringArray } from 'vscode/vscode/vs/base/common/types';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -50,7 +51,7 @@ let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
             isSetForConnection = true;
             const explorerType = remoteAuthority ? [remoteAuthority.split('+')[0]]
                 : (virtualWorkspace ? [virtualWorkspace]
-                    : (this.storageService.get(REMOTE_EXPLORER_TYPE_KEY, 1 )?.split(',') ?? this.storageService.get(REMOTE_EXPLORER_TYPE_KEY, 0 )?.split(',')));
+                    : (this.storageService.get(REMOTE_EXPLORER_TYPE_KEY, StorageScope.WORKSPACE)?.split(',') ?? this.storageService.get(REMOTE_EXPLORER_TYPE_KEY, StorageScope.PROFILE)?.split(',')));
             if (explorerType !== undefined) {
                 authority = this.getAuthorityForExplorerType(explorerType);
             }

package/vscode/src/vs/workbench/contrib/remote/browser/remote.contribution.js CHANGED Viewed

@@ -1,6 +1,7 @@
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ShowCandidateContribution } from './showCandidate.js';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { TunnelFactoryContribution } from './tunnelFactory.js';
 import { RemoteAgentConnectionStatusListener, RemoteMarkers } from './remote.js';
 import { RemoteStatusIndicator } from './remoteIndicator.js';
@@ -8,12 +9,12 @@ import { ForwardedPortsView, PortRestore, AutomaticPortForwarding } from 'vscode
 import { InitialRemoteConnectionHealthContribution } from './remoteConnectionHealth.js';
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-registerWorkbenchContribution2(ShowCandidateContribution.ID, ShowCandidateContribution, 2 );
-registerWorkbenchContribution2(TunnelFactoryContribution.ID, TunnelFactoryContribution, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(RemoteAgentConnectionStatusListener, 4 );
-registerWorkbenchContribution2(RemoteStatusIndicator.ID, RemoteStatusIndicator, 1 );
-workbenchContributionsRegistry.registerWorkbenchContribution(ForwardedPortsView, 3 );
-workbenchContributionsRegistry.registerWorkbenchContribution(PortRestore, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(AutomaticPortForwarding, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(InitialRemoteConnectionHealthContribution, 3 );
+registerWorkbenchContribution2(ShowCandidateContribution.ID, ShowCandidateContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(TunnelFactoryContribution.ID, TunnelFactoryContribution, WorkbenchPhase.BlockRestore);
+workbenchContributionsRegistry.registerWorkbenchContribution(RemoteAgentConnectionStatusListener, LifecyclePhase.Eventually);
+registerWorkbenchContribution2(RemoteStatusIndicator.ID, RemoteStatusIndicator, WorkbenchPhase.BlockStartup);
+workbenchContributionsRegistry.registerWorkbenchContribution(ForwardedPortsView, LifecyclePhase.Restored);
+workbenchContributionsRegistry.registerWorkbenchContribution(PortRestore, LifecyclePhase.Eventually);
+workbenchContributionsRegistry.registerWorkbenchContribution(AutomaticPortForwarding, LifecyclePhase.Eventually);
+workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, LifecyclePhase.Eventually);
+workbenchContributionsRegistry.registerWorkbenchContribution(InitialRemoteConnectionHealthContribution, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/remote/browser/remote.js CHANGED Viewed

@@ -17,15 +17,17 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { FilterViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewsViewlet';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/remote/browser/remoteExplorer';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { PersistentConnectionEventType } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { ReloadWindowAction } from 'vscode/vscode/vs/workbench/browser/actions/windowActions';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -512,7 +514,7 @@ RemoteViewPaneContainer = ( (__decorate([
     },
     icon: remoteExplorerViewIcon,
     order: 4
-}, 0 );
+}, ViewContainerLocation.Sidebar);
 let RemoteMarkers = class RemoteMarkers {
     constructor(remoteAgentService, timerService) {
         remoteAgentService.getEnvironment().then(remoteEnv => {
@@ -619,7 +621,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                     visibleProgress = null;
                 }
                 if (!location) {
-                    location = quickInputVisible ? 15  : 20 ;
+                    location = quickInputVisible ? ProgressLocation.Notification : ProgressLocation.Dialog;
                 }
                 return (
                      (new VisibleProgress(
@@ -632,8 +634,8 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                                 buttons[choice].callback();
                             }
                             else {
-                                if (location === 20 ) {
-                                    visibleProgress = showProgress(15 , buttons, lastReport);
+                                if (location === ProgressLocation.Dialog) {
+                                    visibleProgress = showProgress(ProgressLocation.Notification, buttons, lastReport);
                                 }
                                 else {
                                     hideProgress();
@@ -677,7 +679,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                     disposableListener = null;
                 }
                 switch (e.type) {
-                    case 0 :
+                    case PersistentConnectionEventType.ConnectionLost:
                         reconnectionToken = e.reconnectionToken;
                         lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
                         reconnectionAttempts = 0;
@@ -692,14 +694,14 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                             visibleProgress.report(( localizeWithPath(_moduleId, 12, "Connection Lost")));
                         }
                         break;
-                    case 1 :
+                    case PersistentConnectionEventType.ReconnectionWait:
                         if (visibleProgress) {
                             reconnectWaitEvent = e;
                             visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
                             visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
                         }
                         break;
-                    case 2 :
+                    case PersistentConnectionEventType.ReconnectionRunning:
                         reconnectionToken = e.reconnectionToken;
                         lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
                         reconnectionAttempts = e.attempt;
@@ -713,13 +715,13 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                             visibleProgress = showProgress(null, [reloadButton]);
                             visibleProgress.report(( localizeWithPath(_moduleId, 13, "Disconnected. Attempting to reconnect...")));
                             disposableListener = quickInputService.onShow(() => {
-                                if (visibleProgress && visibleProgress.location === 20 ) {
-                                    visibleProgress = showProgress(15 , [reloadButton], visibleProgress.lastReport);
+                                if (visibleProgress && visibleProgress.location === ProgressLocation.Dialog) {
+                                    visibleProgress = showProgress(ProgressLocation.Notification, [reloadButton], visibleProgress.lastReport);
                                 }
                             });
                         }
                         break;
-                    case 3 :
+                    case PersistentConnectionEventType.ReconnectionPermanentFailure:
                         reconnectionToken = e.reconnectionToken;
                         lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
                         reconnectionAttempts = e.attempt;
@@ -748,7 +750,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                             });
                         }
                         break;
-                    case 4 :
+                    case PersistentConnectionEventType.ConnectionGain:
                         reconnectionToken = e.reconnectionToken;
                         lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
                         reconnectionAttempts = e.attempt;

package/vscode/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.js CHANGED Viewed

@@ -9,6 +9,7 @@ import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHos
 import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -34,6 +35,12 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
         }
     }
     async _confirmConnection() {
+        let ConnectionChoice;
+        ( ((function(ConnectionChoice) {
+            ConnectionChoice[ConnectionChoice["Allow"] = 1] = "Allow";
+            ConnectionChoice[ConnectionChoice["LearnMore"] = 2] = "LearnMore";
+            ConnectionChoice[ConnectionChoice["Cancel"] = 0] = "Cancel";
+        })(ConnectionChoice || (ConnectionChoice = {}))));
         const { result, checkboxChecked } = await this.dialogService.prompt({
             type: Severity$1.Warning,
             message: ( localizeWithPath(
@@ -45,26 +52,26 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
             buttons: [
                 {
                     label: ( localizeWithPath(_moduleId, 1, "&&Allow")),
-                    run: () => 1
+                    run: () => ConnectionChoice.Allow
                 },
                 {
                     label: ( localizeWithPath(_moduleId, 2, "&&Learn More")),
-                    run: async () => { await this.openerService.open('https://aka.ms/vscode-remote/faq/old-linux'); return 2 ; }
+                    run: async () => { await this.openerService.open('https://aka.ms/vscode-remote/faq/old-linux'); return ConnectionChoice.LearnMore; }
                 }
             ],
             cancelButton: {
-                run: () => 0
+                run: () => ConnectionChoice.Cancel
             },
             checkbox: {
                 label: ( localizeWithPath(_moduleId, 3, "Do not show again")),
             }
         });
-        if (result === 2 ) {
+        if (result === ConnectionChoice.LearnMore) {
             return await this._confirmConnection();
         }
-        const allowed = result === 1 ;
+        const allowed = result === ConnectionChoice.Allow;
         if (allowed && checkboxChecked) {
-            this.storageService.store(`${REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY}.${this._environmentService.remoteAuthority}`, allowed, 0 , 1 );
+            this.storageService.store(`${REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY}.${this._environmentService.remoteAuthority}`, allowed, StorageScope.PROFILE, StorageTarget.MACHINE);
         }
         return allowed;
     }
@@ -72,12 +79,12 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
         try {
             const environment = await this._remoteAgentService.getRawEnvironment();
             if (environment && environment.isUnsupportedGlibc) {
-                let allowed = this.storageService.getBoolean(`${REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY}.${this._environmentService.remoteAuthority}`, 0 );
+                let allowed = this.storageService.getBoolean(`${REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY}.${this._environmentService.remoteAuthority}`, StorageScope.PROFILE);
                 if (allowed === undefined) {
                     allowed = await this._confirmConnection();
                 }
                 if (allowed) {
-                    const bannerDismissedVersion = this.storageService.get(`${BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY}`, 0 ) ?? '';
+                    const bannerDismissedVersion = this.storageService.get(`${BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY}`, StorageScope.PROFILE) ?? '';
                     const shouldShowBanner = bannerDismissedVersion.slice(0, bannerDismissedVersion.lastIndexOf('.')) !== this.productService.version.slice(0, this.productService.version.lastIndexOf('.'));
                     if (shouldShowBanner) {
                         const actions = [
@@ -98,7 +105,7 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
                             icon: Codicon.warning,
                             closeLabel: `Do not show again in v${this.productService.version}`,
                             onClose: () => {
-                                this.storageService.store(`${BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY}`, this.productService.version, 0 , 1 );
+                                this.storageService.store(`${BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY}`, this.productService.version, StorageScope.PROFILE, StorageTarget.MACHINE);
                             }
                         });
                     }

package/vscode/src/vs/workbench/contrib/remote/browser/remoteIndicator.js CHANGED Viewed

@@ -7,6 +7,7 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MenuId, registerAction2, Action2, MenuRegistry, MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -16,6 +17,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { PersistentConnectionEventType } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { isWeb, PlatformToString, platform } from 'vscode/vscode/vs/base/common/platform';
@@ -32,7 +34,10 @@ import { VIEWLET_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vs
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { RemoteNameContext, VirtualWorkspaceContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { DomEmitter } from 'vscode/vscode/vs/base/browser/event';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
@@ -138,8 +143,8 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     title: ( localize2WithPath(_moduleId, 1, "Show Remote Menu")),
                     f1: true,
                     keybinding: {
-                        weight: 200 ,
-                        primary: 2048  | 512  | 45 ,
+                        weight: KeybindingWeight.WorkbenchContrib,
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyO,
                     }
                 });
                 this.run = () => that.showRemoteMenu();
@@ -180,7 +185,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     });
                     this.run = (accessor, input) => {
                         const paneCompositeService = accessor.get(IPaneCompositePartService);
-                        return paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true).then(viewlet => {
+                        return paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true).then(viewlet => {
                             if (viewlet) {
                                 (viewlet?.getViewPaneContainer()).search(`@recommended:remotes`);
                                 viewlet.focus();
@@ -208,15 +213,15 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             if (connection) {
                 this._register(connection.onDidStateChange((e) => {
                     switch (e.type) {
-                        case 0 :
-                        case 2 :
-                        case 1 :
+                        case PersistentConnectionEventType.ConnectionLost:
+                        case PersistentConnectionEventType.ReconnectionRunning:
+                        case PersistentConnectionEventType.ReconnectionWait:
                             this.setConnectionState('reconnecting');
                             break;
-                        case 3 :
+                        case PersistentConnectionEventType.ReconnectionPermanentFailure:
                             this.setConnectionState('disconnected');
                             break;
-                        case 4 :
+                        case PersistentConnectionEventType.ConnectionGain:
                             this.setConnectionState('connected');
                             break;
                     }
@@ -462,7 +467,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             this.remoteStatusEntry.update(properties);
         }
         else {
-            this.remoteStatusEntry = this.statusbarService.addEntry(properties, 'status.host', 0 , Number.MAX_VALUE );
+            this.remoteStatusEntry = this.statusbarService.addEntry(properties, 'status.host', StatusbarAlignment.LEFT, Number.MAX_VALUE );
         }
     }
     withNetworkStatus(initialText, initialTooltip, showProgress) {

package/vscode/src/vs/workbench/contrib/remote/browser/remoteStartEntry.contribution.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { RemoteStartEntry } from './remoteStartEntry.js';
 ( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(RemoteStartEntry, 3 );
+    .registerWorkbenchContribution(RemoteStartEntry, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/remote/common/remote.contribution.js CHANGED Viewed

@@ -1,8 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
-import { OS, isWeb } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem, isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -34,9 +35,9 @@ let LabelContribution = class LabelContribution {
             const os = remoteEnvironment?.os || OS;
             const formatting = {
                 label: '${path}',
-                separator: os === 1  ? '\\' : '/',
-                tildify: os !== 1 ,
-                normalizeDriveLetter: os === 1 ,
+                separator: os === OperatingSystem.Windows ? '\\' : '/',
+                tildify: os !== OperatingSystem.Windows,
+                normalizeDriveLetter: os === OperatingSystem.Windows,
                 workspaceSuffix: isWeb ? undefined : Schemas.vscodeRemote
             };
             this.labelService.registerFormatter({
@@ -121,9 +122,9 @@ RemoteInvalidWorkspaceDetector = ( (__decorate([
     ( (__param(5, IRemoteAgentService)))
 ], RemoteInvalidWorkspaceDetector)));
 const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
-registerWorkbenchContribution2(LabelContribution.ID, LabelContribution, 1 );
-workbenchContributionsRegistry.registerWorkbenchContribution(RemoteChannelsContribution, 3 );
-registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidWorkspaceDetector, 1 );
+registerWorkbenchContribution2(LabelContribution.ID, LabelContribution, WorkbenchPhase.BlockStartup);
+workbenchContributionsRegistry.registerWorkbenchContribution(RemoteChannelsContribution, LifecyclePhase.Restored);
+registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidWorkspaceDetector, WorkbenchPhase.BlockStartup);
 {
     class TriggerReconnectAction extends Action2 {
         constructor() {

package/vscode/src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { getMediaOrTextMime } from 'vscode/vscode/vs/base/common/mime';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { FileOperationError } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileOperationError, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 let BrowserRemoteResourceLoader = class BrowserRemoteResourceLoader extends Disposable {
@@ -24,7 +24,7 @@ let BrowserRemoteResourceLoader = class BrowserRemoteResourceLoader extends Disp
             }
             catch (e) {
                 const str = VSBuffer.fromString(e.message).buffer;
-                if (e instanceof FileOperationError && e.fileOperationResult === 1 ) {
+                if (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
                     return request.respondWith(404, str, {});
                 }
                 else {

package/vscode/src/vs/workbench/services/remote/browser/remoteAgentService.js CHANGED Viewed

@@ -10,7 +10,7 @@ import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign.service
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
@@ -71,6 +71,6 @@ RemoteConnectionFailureNotificationContribution = ( (__decorate([
     ( (__param(1, IDialogService))),
     ( (__param(2, IHostService)))
 ], RemoteConnectionFailureNotificationContribution)));
-registerWorkbenchContribution2(RemoteConnectionFailureNotificationContribution.ID, RemoteConnectionFailureNotificationContribution, 2 );
+registerWorkbenchContribution2(RemoteConnectionFailureNotificationContribution.ID, RemoteConnectionFailureNotificationContribution, WorkbenchPhase.BlockRestore);
 export { RemoteAgentService };

package/vscode/src/vs/workbench/services/remote/common/remoteExtensionsScanner.js CHANGED Viewed

@@ -8,16 +8,19 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 import { IRemoteUserDataProfilesService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale.service';
+import { IWorkbenchExtensionManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 let RemoteExtensionsScannerService = class RemoteExtensionsScannerService {
-    constructor(remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, logService, activeLanguagePackService) {
+    constructor(remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, activeLanguagePackService, extensionManagementService, logService) {
         this.remoteAgentService = remoteAgentService;
         this.environmentService = environmentService;
         this.userDataProfileService = userDataProfileService;
         this.remoteUserDataProfilesService = remoteUserDataProfilesService;
-        this.logService = logService;
         this.activeLanguagePackService = activeLanguagePackService;
+        this.extensionManagementService = extensionManagementService;
+        this.logService = logService;
     }
     whenExtensionsReady() {
         return this.withChannel(channel => channel.call('whenExtensionsReady'), undefined);
@@ -27,7 +30,13 @@ let RemoteExtensionsScannerService = class RemoteExtensionsScannerService {
             const languagePack = await this.activeLanguagePackService.getExtensionIdProvidingCurrentLocale();
             return await this.withChannel(async (channel) => {
                 const profileLocation = this.userDataProfileService.currentProfile.isDefault ? undefined : (await this.remoteUserDataProfilesService.getRemoteProfile(this.userDataProfileService.currentProfile)).extensionsResource;
-                const scannedExtensions = await channel.call('scanExtensions', [language, profileLocation, this.environmentService.extensionDevelopmentLocationURI, languagePack]);
+                const scannedExtensions = await channel.call('scanExtensions', [
+                    language,
+                    profileLocation,
+                    this.extensionManagementService.getInstalledWorkspaceExtensionLocations(),
+                    this.environmentService.extensionDevelopmentLocationURI,
+                    languagePack
+                ]);
                 scannedExtensions.forEach((extension) => {
                     extension.extensionLocation = URI.revive(extension.extensionLocation);
                 });
@@ -67,8 +76,9 @@ RemoteExtensionsScannerService = ( __decorate([
     ( __param(1, IWorkbenchEnvironmentService)),
     ( __param(2, IUserDataProfileService)),
     ( __param(3, IRemoteUserDataProfilesService)),
-    ( __param(4, ILogService)),
-    ( __param(5, IActiveLanguagePackService))
+    ( __param(4, IActiveLanguagePackService)),
+    ( __param(5, IWorkbenchExtensionManagementService)),
+    ( __param(6, ILogService))
 ], RemoteExtensionsScannerService));
 export { RemoteExtensionsScannerService };

package/vscode/src/vs/workbench/services/remote/common/remoteFileSystemProviderClient.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
 import { DiskFileSystemProviderClient } from '../../../../platform/files/common/diskFileSystemProviderClient.js';
 const REMOTE_FILE_SYSTEM_CHANNEL_NAME = 'remoteFilesystem';
@@ -33,7 +34,7 @@ class RemoteFileSystemProviderClient extends DiskFileSystemProviderClient {
         return disposables;
     }
     constructor(remoteAgentEnvironment, connection) {
-        super(connection.getChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME), { pathCaseSensitive: remoteAgentEnvironment.os === 3  });
+        super(connection.getChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME), { pathCaseSensitive: remoteAgentEnvironment.os === OperatingSystem.Linux });
     }
 }

package/vscode/src/vs/workbench/services/tunnel/browser/tunnelService.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { AbstractTunnelService, isTunnelProvider } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';