@codingame/monaco-vscode-extensions-service-override 33.0.9 → 34.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js

@@ -12,13 +12,16 @@ import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+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 { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { LogLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service';
 import { IWorkbenchMcpGatewayService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpGatewayService.service';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { McpServerLaunch, McpServerTransportType, McpServerDefinition, McpServerTrust, McpCollectionSortOrder, extensionPrefixedIdentifier, McpConnectionState, UserInteractionRequiredError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { McpServerLaunch, McpServerTransportType, McpServerDefinition, McpServerTrust, McpCollectionSortOrder, extensionPrefixedIdentifier, McpConnectionState, mcpOAuthClientSecretStorageKey, UserInteractionRequiredError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { mcpEnterpriseManagedAuthIdpSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IAuthenticationMcpAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpAccessService.service';
 import { IAuthenticationMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service';
 import { IAuthenticationMcpUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service';
@@ -44,7 +47,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         _extensionService,
         _contextKeyService,
         _telemetryService,
-        _mcpGatewayService
+        _mcpGatewayService,
+        _configurationService,
+        _secretStorageService
     ) {
         super();
         this._extHostContext = _extHostContext;
@@ -59,6 +64,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         this._contextKeyService = _contextKeyService;
         this._telemetryService = _telemetryService;
         this._mcpGatewayService = _mcpGatewayService;
+        this._configurationService = _configurationService;
+        this._secretStorageService = _secretStorageService;
         this._serverIdCounter = 0;
         this._servers = ( new Map());
         this._serverDefinitions = ( new Map());
@@ -235,7 +242,67 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         const authorizationServer = URI.revive(authDetails.authorizationServer);
         const resourceServer = authDetails.resourceMetadata?.resource ? ( URI.parse(authDetails.resourceMetadata.resource)) : undefined;
         const resolvedScopes = authDetails.scopes ?? authDetails.resourceMetadata?.scopes_supported ?? authDetails.authorizationServerMetadata.scopes_supported ?? [];
+        if (authDetails.enterpriseManaged) {
+            const resource = authDetails.resourceMetadata?.resource;
+            if (!resource) {
+                throw ( new Error(( localize(
+                    2699,
+                    "The enterprise-managed MCP server '{0}' did not advertise a protected-resource metadata document with a 'resource' identifier.",
+                    server.label
+                ))));
+            }
+            const resourceAuthServers = authDetails.resourceMetadata?.authorization_servers ?? [];
+            const audience = resourceAuthServers[0];
+            if (!audience) {
+                throw ( new Error(( localize(
+                    2700,
+                    "The enterprise-managed MCP server '{0}' did not advertise an `authorization_servers` entry in its protected-resource metadata.",
+                    server.label
+                ))));
+            }
+            const xaaScopes = authDetails.scopes ?? authDetails.resourceMetadata?.scopes_supported ?? [];
+            const issuer = this._ensureXaaIssuer();
+            const xaaProviderId = await this._authenticationService.createOrGetXaaProvider(issuer);
+            if (!xaaProviderId) {
+                return undefined;
+            }
+            const resourceClientId = clientId ?? authDetails.clientId;
+            let resourceClientSecret;
+            if (resourceClientId) {
+                try {
+                    resourceClientSecret = await this._secretStorageService.get(mcpOAuthClientSecretStorageKey(resource, resourceClientId));
+                } catch {}
+            }
+            return this._getSessionForProvider(
+                id,
+                server,
+                xaaProviderId,
+                xaaScopes,
+                issuer,
+                errorOnUserInteraction,
+                resourceClientId,
+                resource,
+                audience,
+                resourceClientSecret
+            );
+        }
         let providerId = await this._authenticationService.getOrActivateProviderIdForServer(authorizationServer, resourceServer);
+        const resolvedClientId = clientId ?? authDetails.clientId;
+        const mcpServerUrl = server.launch.type === McpServerTransportType.HTTP ? ( server.launch.uri.toString(true)) : undefined;
+        let clientSecret;
+        let didLookupClientSecret = false;
+        if (resolvedClientId && mcpServerUrl) {
+            try {
+                clientSecret = await this._secretStorageService.get(mcpOAuthClientSecretStorageKey(mcpServerUrl, resolvedClientId));
+                didLookupClientSecret = true;
+            } catch {}
+        }
+        if (didLookupClientSecret && providerId && !forceNewRegistration && this._authenticationService.isDynamicAuthenticationProvider(providerId)) {
+            const registered = await this._dynamicAuthenticationProviderStorageService.getClientRegistration(providerId);
+            if (registered && registered.clientSecret !== clientSecret) {
+                forceNewRegistration = true;
+            }
+        }
         if (forceNewRegistration && providerId) {
             if (!this._authenticationService.isDynamicAuthenticationProvider(providerId)) {
                 throw ( new Error("Cannot force new registration for a non-dynamic authentication provider."));
@@ -249,7 +316,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 authorizationServer,
                 authDetails.authorizationServerMetadata,
                 authDetails.resourceMetadata,
-                authDetails.clientId
+                resolvedClientId,
+                clientSecret
             );
             if (!provider) {
                 return undefined;
@@ -263,10 +331,40 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             resolvedScopes,
             authorizationServer,
             errorOnUserInteraction,
-            clientId ?? authDetails.clientId,
-            authDetails.resourceMetadata?.resource
+            resolvedClientId,
+            authDetails.resourceMetadata?.resource,
+             undefined,
+            clientSecret
         );
     }
+    _ensureXaaIssuer() {
+        const config = this._configurationService.getValue(mcpEnterpriseManagedAuthIdpSection) ?? {};
+        const configuredIssuer = config.issuer?.trim();
+        if (!configuredIssuer) {
+            throw ( new Error(( localize(
+                2701,
+                "Enterprise-managed MCP authentication requires `mcp.enterpriseManagedAuth.idp.issuer` to be configured. Set it via enterprise policy (Windows Group Policy / macOS managed preferences / Linux `/etc/vscode/policy.json`) or, for local testing, by hand-editing `settings.json`."
+            ))));
+        }
+        let parsed;
+        try {
+            parsed = ( URI.parse(configuredIssuer));
+        } catch {
+            throw ( new Error(( localize(
+                2702,
+                "Enterprise-managed MCP authentication requires `mcp.enterpriseManagedAuth.idp.issuer` to be a valid URL; got '{0}'.",
+                configuredIssuer
+            ))));
+        }
+        if (parsed.scheme !== "https" && parsed.scheme !== "http") {
+            throw ( new Error(( localize(
+                2703,
+                "Enterprise-managed MCP authentication requires `mcp.enterpriseManagedAuth.idp.issuer` to use the `https` or `http` scheme; got '{0}'.",
+                configuredIssuer
+            ))));
+        }
+        return parsed;
+    }
     async _getSessionForProvider(
         serverId,
         server,
@@ -275,13 +373,21 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         authorizationServer,
         errorOnUserInteraction = false,
         clientId,
-        resource
+        resource,
+        audience,
+        clientSecret
     ) {
         const sessions = await this._authenticationService.getSessions(providerId, scopes, {
             authorizationServer,
             clientId,
-            resource
+            clientSecret,
+            resource,
+            audience
         }, true);
+        if (server.launch.type !== McpServerTransportType.HTTP) {
+            return undefined;
+        }
+        const mcpServerUrl = ( server.launch.uri.toString(true));
         const accountNamePreference = this.authenticationMcpServersService.getAccountPreference(server.id, providerId);
         let matchingAccountPreferenceSession;
         if (accountNamePreference) {
@@ -290,7 +396,12 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         const provider = this._authenticationService.getProvider(providerId);
         let session;
         if (sessions.length) {
-            if (matchingAccountPreferenceSession && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, server.id)) {
+            if (matchingAccountPreferenceSession && this.authenticationMCPServerAccessService.isAccessAllowedForUrl(
+                providerId,
+                matchingAccountPreferenceSession.account.label,
+                server.id,
+                mcpServerUrl
+            )) {
                 this.authenticationMCPServerUsageService.addAccountUsage(
                     providerId,
                     matchingAccountPreferenceSession.account.label,
@@ -301,7 +412,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 this._serverAuthTracking.track(providerId, serverId, scopes);
                 return matchingAccountPreferenceSession.accessToken;
             }
-            if (!provider.supportsMultipleAccounts && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, sessions[0].account.label, server.id)) {
+            if (!provider.supportsMultipleAccounts && this.authenticationMCPServerAccessService.isAccessAllowedForUrl(providerId, sessions[0].account.label, server.id, mcpServerUrl)) {
                 this.authenticationMCPServerUsageService.addAccountUsage(providerId, sessions[0].account.label, scopes, server.id, server.label);
                 this._serverAuthTracking.track(providerId, serverId, scopes);
                 return sessions[0].accessToken;
@@ -330,14 +441,17 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                     account: accountToCreate,
                     authorizationServer,
                     clientId,
-                    resource
+                    clientSecret,
+                    resource,
+                    audience
                 });
             } while (accountToCreate && accountToCreate.label !== session.account.label && !(await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)));
         }
         this.authenticationMCPServerAccessService.updateAllowedMcpServers(providerId, session.account.label, [{
             id: server.id,
             name: server.label,
-            allowed: true
+            allowed: true,
+            url: mcpServerUrl
         }]);
         this.authenticationMcpServersService.updateAccountPreference(server.id, providerId, session.account);
         this.authenticationMCPServerUsageService.addAccountUsage(providerId, session.account.label, scopes, server.id, server.label);
@@ -346,9 +460,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2647, "Incorrect account detected")),
+            message: ( localize(2704, "Incorrect account detected")),
             detail: ( localize(
-                2648,
+                2705,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -356,10 +470,10 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2649, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2706, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2650, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2707, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -391,7 +505,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             } catch (e) {
                 if (UserInteractionRequiredError.is(e)) {
                     server.pushLog(LogLevel.Warning, ( localize(
-                        2651,
+                        2708,
                         "Authentication session for {0} removed, stopping server",
                         providerLabel
                     )));
@@ -438,18 +552,18 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession ? ( localize(
-            2652,
+            2709,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         )) : ( localize(
-            2653,
+            2710,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [{
-            label: ( localize(2654, "&&Allow")),
+            label: ( localize(2711, "&&Allow")),
             run() {
                 return true;
             }
@@ -474,7 +588,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         super.dispose();
     }
 };
-MainThreadMcp = __decorate([extHostNamedCustomer(MainContext.MainThreadMcp), ( __param(1, IMcpRegistry)), ( __param(2, IDialogService)), ( __param(3, IAuthenticationService)), ( __param(4, IAuthenticationMcpService)), ( __param(5, IAuthenticationMcpAccessService)), ( __param(6, IAuthenticationMcpUsageService)), ( __param(7, IDynamicAuthenticationProviderStorageService)), ( __param(8, IExtensionService)), ( __param(9, IContextKeyService)), ( __param(10, ITelemetryService)), ( __param(11, IWorkbenchMcpGatewayService))], MainThreadMcp);
+MainThreadMcp = __decorate([extHostNamedCustomer(MainContext.MainThreadMcp), ( __param(1, IMcpRegistry)), ( __param(2, IDialogService)), ( __param(3, IAuthenticationService)), ( __param(4, IAuthenticationMcpService)), ( __param(5, IAuthenticationMcpAccessService)), ( __param(6, IAuthenticationMcpUsageService)), ( __param(7, IDynamicAuthenticationProviderStorageService)), ( __param(8, IExtensionService)), ( __param(9, IContextKeyService)), ( __param(10, ITelemetryService)), ( __param(11, IWorkbenchMcpGatewayService)), ( __param(12, IConfigurationService)), ( __param(13, ISecretStorageService))], MainThreadMcp);
 class ExtHostMcpServerLaunch extends Disposable {
     pushLog(level, message) {
         this._onDidLog.fire({

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js

@@ -66,13 +66,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2655, "Extension"));
+                source = ( localize(2712, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2656, "Manage Extension")),
+                    label: ( localize(2713, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand("_extensions.manage", options.source.identifier.value);
                     }
@@ -111,12 +111,12 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2657, "Cancel")),
+                    label: ( localize(2714, "Cancel")),
                     run: () => undefined
                 };
             } else {
                 cancelButton = {
-                    label: ( localize(2658, "&&OK")),
+                    label: ( localize(2715, "&&OK")),
                     run: () => undefined
                 };
             }

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2659, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2716, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js

@@ -94,11 +94,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2660, "Show Output")),
+            name: ( localize(2717, "Show Output")),
             text: "$(output)",
-            ariaLabel: ( localize(2661, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2718, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2662, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2719, "Show {0} Output Channel", channel.label)),
             kind: "prominent"
         };
         if (!this._outputStatusItem.value) {

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js

@@ -38,7 +38,7 @@ let MainThreadProgress = class MainThreadProgress {
                 location: ProgressLocation.Notification,
                 secondaryActions: [toAction({
                     id: extensionId,
-                    label: ( localize(2663, "Manage Extension")),
+                    label: ( localize(2720, "Manage Extension")),
                     run: () => this._commandService.executeCommand("_extensions.manage", extensionId)
                 })]
             };

package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js

@@ -17,7 +17,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2664, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2721, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( new Error("listener failed")));

package/vscode/src/vs/workbench/api/browser/mainThreadTask.js

@@ -397,7 +397,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2665, "{0}: {1}", source.label, task.name));
+        const label = ( localize(2722, "{0}: {1}", source.label, task.name));
         const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
         const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
         const result = ( new ContributedTask(

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Disposable, MutableDisposable, toDisposable, combinedDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, MutableDisposable, combinedDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -55,10 +55,10 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         this._terminalCompletionService = _terminalCompletionService;
         this._environmentService = _environmentService;
         this._extHostTerminals = ( new Map());
-        this._terminalProcessProxies = ( new Map());
-        this._profileProviders = ( new Map());
-        this._completionProviders = ( new Map());
-        this._quickFixProviders = ( new Map());
+        this._terminalProcessProxies = this._register(( new DisposableMap()));
+        this._profileProviders = this._register(( new DisposableMap()));
+        this._completionProviders = this._register(( new DisposableMap()));
+        this._quickFixProviders = this._register(( new DisposableMap()));
         this._dataEventTracker = this._register(( new MutableDisposable()));
         this._sendCommandEventListener = this._register(( new MutableDisposable()));
         this._linkProvider = this._register(( new MutableDisposable()));
@@ -116,13 +116,6 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
             }));
             this._proxy.$initEnvironmentVariableCollections(serializedCollections);
         }
-        this._store.add(toDisposable(() => {
-            for (const e of ( this._terminalProcessProxies.values())) {
-                e.proxy.dispose();
-                e.store.dispose();
-            }
-            this._terminalProcessProxies.clear();
-        }));
         remoteAgentService.getEnvironment().then(async env => {
             this._os = env?.os || OS;
             this._updateDefaultProfile();
@@ -130,14 +123,6 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         this._register(
             this._terminalProfileService.onDidChangeAvailableProfiles(() => this._updateDefaultProfile())
         );
-        this._register(toDisposable(() => {
-            for (const provider of ( this._profileProviders.values())) {
-                provider.dispose();
-            }
-            for (const provider of ( this._quickFixProviders.values())) {
-                provider.dispose();
-            }
-        }));
     }
     async _updateDefaultProfile() {
         const remoteAuthority = this._environmentService.remoteAuthority;
@@ -319,8 +304,7 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         );
     }
     $unregisterCompletionProvider(id) {
-        this._completionProviders.get(id)?.dispose();
-        this._completionProviders.delete(id);
+        this._completionProviders.deleteAndDispose(id);
     }
     $registerProfileProvider(id, extensionIdentifier) {
         this._profileProviders.set(
@@ -333,8 +317,7 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         );
     }
     $unregisterProfileProvider(id) {
-        this._profileProviders.get(id)?.dispose();
-        this._profileProviders.delete(id);
+        this._profileProviders.deleteAndDispose(id);
     }
     async $registerQuickFixProvider(id, extensionId) {
         this._quickFixProviders.set(id, this._terminalQuickFixService.registerQuickFixProvider(id, {
@@ -376,8 +359,7 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         }));
     }
     $unregisterQuickFixProvider(id) {
-        this._quickFixProviders.get(id)?.dispose();
-        this._quickFixProviders.delete(id);
+        this._quickFixProviders.deleteAndDispose(id);
     }
     _onActiveTerminalChanged(terminalId) {
         this._proxy.$acceptActiveTerminalChanged(terminalId);
@@ -403,12 +385,7 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
             terminalInstance.exitCode,
             terminalInstance.exitReason ?? TerminalExitReason.Unknown
         );
-        const proxy = this._terminalProcessProxies.get(terminalInstance.instanceId);
-        if (proxy) {
-            proxy.proxy.dispose();
-            proxy.store.dispose();
-            this._terminalProcessProxies.delete(terminalInstance.instanceId);
-        }
+        this._terminalProcessProxies.deleteAndDispose(terminalInstance.instanceId);
     }
     _onTerminalOpened(terminalInstance) {
         const extHostTerminalId = terminalInstance.shellLaunchConfig.extHostTerminalId;
@@ -444,9 +421,10 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
     _onRequestStartExtensionTerminal(request) {
         const proxy = request.proxy;
         const store = ( new DisposableStore());
+        store.add(proxy);
         this._terminalProcessProxies.set(proxy.instanceId, {
             proxy,
-            store
+            dispose: () => store.dispose()
         });
         const initialDimensions = request.cols && request.rows ? {
             columns: request.cols,

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js

@@ -116,13 +116,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2666,
+            2723,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-            label: ( localize(2667, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(2724, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 this.elevateionRetry = true;
                 await this.remoteExplorerService.close({

package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js

@@ -61,7 +61,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                     }, token);
                 } catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action("default", ( localize(2668, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action("default", ( localize(2725, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId
@@ -70,7 +70,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2669, "Could not open uri with '{0}': {1}", id, (e.toString()))),
+                            message: ( localize(2726, "Could not open uri with '{0}': {1}", id, (e.toString()))),
                             actions: {
                                 primary: [openDefaultAction]
                             }

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js

@@ -118,7 +118,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
                 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
                 <meta http-equiv="Content-Security-Policy" content="default-src 'none';">
             </head>
-            <body>${( localize(2670, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+            <body>${( localize(2727, "An error occurred while loading view: {0}", escape(viewType)))}</body>
         </html>`;
     }
 };
@@ -133,6 +133,7 @@ function reviveWebviewContentOptions(webviewOptions) {
     return {
         allowScripts: webviewOptions.enableScripts,
         allowForms: webviewOptions.enableForms,
+        forwardUntrustedKeypressEvents: true,
         enableCommandUris: webviewOptions.enableCommandUris,
         localResourceRoots: Array.isArray(webviewOptions.localResourceRoots) ? ( webviewOptions.localResourceRoots.map(r => URI.revive(r))) : undefined,
         portMapping: webviewOptions.portMapping

package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js

@@ -114,10 +114,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2671, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2728, "Extension '{0}' added 1 folder to the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2672,
+                    2729,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -126,10 +126,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2673, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2730, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2674,
+                    2731,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -137,7 +137,7 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
             }
         }
         else {
-            message = ( localize(2675, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2732, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -60,7 +60,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         }));
         this._register(extensionService.onWillStop(e => {
             e.veto(true, ( localize(
-                8572,
+                8731,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));