@codingame/monaco-vscode-extensions-service-override 36.2.7 → 37.1.0

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

@@ -111,7 +111,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2744,
+                    2983,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -119,7 +119,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                         id: "reload",
-                        label: ( localize(2745, "Reload Window")),
+                        label: ( localize(2984, "Reload Window")),
                         run: () => this._hostService.reload()
                     })]
                 }
@@ -130,7 +130,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2746,
+                        2985,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -140,7 +140,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2747,
+                        2986,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -148,7 +148,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                     actions: {
                         primary: [toAction({
                             id: "manageWorkspaceTrust",
-                            label: ( localize(2748, "Manage Workspace Trust")),
+                            label: ( localize(2987, "Manage Workspace Trust")),
                             run: () => this._commandService.executeCommand("workbench.trust.manage")
                         })]
                     }
@@ -157,7 +157,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2749,
+                        2988,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -165,7 +165,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                     actions: {
                         primary: [toAction({
                             id: "enable",
-                            label: ( localize(2750, "Enable and Reload")),
+                            label: ( localize(2989, "Enable and Reload")),
                             enabled: true,
                             run: () => this._extensionEnablementService.setEnablement(
                                 [missingInstalledDependency],
@@ -178,7 +178,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2751,
+                        2990,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -199,7 +199,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2752,
+                    2991,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
@@ -208,14 +208,14 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                         id: "install",
-                        label: ( localize(2753, "Install and Reload")),
+                        label: ( localize(2992, "Install and Reload")),
                         run: () => this._extensionsWorkbenchService.install(dependencyExtension).then(() => this._hostService.reload(), e => this._notificationService.error(e))
                     })]
                 }
             });
         } else {
             this._notificationService.error(( localize(
-                2754,
+                2993,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

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

@@ -94,25 +94,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2755,
+                                2994,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2756,
+                                2995,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2757,
+                                2996,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         } else  {
                             message = ( localize(
-                                2758,
+                                2997,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -120,25 +120,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     } else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2759,
+                                2998,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2760,
+                                2999,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2761,
+                                3000,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         } else  {
                             message = ( localize(
-                                2762,
+                                3001,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -150,8 +150,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2763, "Show &&Preview")),
-                            cancelButton: ( localize(2764, "Skip Changes"))
+                            primaryButton: ( localize(3002, "Show &&Preview")),
+                            cancelButton: ( localize(3003, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -171,18 +171,18 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             type: Severity.Info,
                             message,
                             buttons: [{
-                                label: ( localize(2765, "&&OK")),
+                                label: ( localize(3004, "&&OK")),
                                 run: () => Choice.OK
                             }, {
-                                label: ( localize(2763, "Show &&Preview")),
+                                label: ( localize(3002, "Show &&Preview")),
                                 run: () => Choice.Preview
                             }],
                             cancelButton: {
-                                label: ( localize(2764, "Skip Changes")),
+                                label: ( localize(3003, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
                             checkbox: {
-                                label: ( localize(2766, "Do not ask me again"))
+                                label: ( localize(3005, "Do not ask me again"))
                             }
                         });
                         if (result === Choice.Cancel) {
@@ -211,15 +211,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                 case FileOperation.CREATE:
-                    return localize(2767, "Running 'File Create' participants...");
+                    return localize(3006, "Running 'File Create' participants...");
                 case FileOperation.MOVE:
-                    return localize(2768, "Running 'File Rename' participants...");
+                    return localize(3007, "Running 'File Rename' participants...");
                 case FileOperation.COPY:
-                    return localize(2769, "Running 'File Copy' participants...");
+                    return localize(3008, "Running 'File Copy' participants...");
                 case FileOperation.DELETE:
-                    return localize(2770, "Running 'File Delete' participants...");
+                    return localize(3009, "Running 'File Delete' participants...");
                 case FileOperation.WRITE:
-                    return localize(2771, "Running 'File Write' participants...");
+                    return localize(3010, "Running 'File Write' participants...");
                 }
             }
         })();
@@ -307,7 +307,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: "files.participants.resetChoice",
             title: {
-                value: ( localize(2772, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(3011, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadGitExtensionService.d.ts

@@ -10,7 +10,7 @@ export declare class MainThreadGitExtensionService extends Disposable implements
     private readonly _proxy;
     private readonly _openRepositorySequencer;
     private _repositoryHandles;
-    private _repositories;
+    private readonly _repositories;
     get repositories(): Iterable<IGitRepository>;
     constructor(extHostContext: IExtHostContext, gitService: IGitService);
     private _initializeDelegate;

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Sequencer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -76,7 +76,7 @@ let MainThreadGitExtensionService = class MainThreadGitExtensionService extends
         this.gitService = gitService;
         this._openRepositorySequencer = ( new Sequencer());
         this._repositoryHandles = ( new ResourceMap());
-        this._repositories = ( new Map());
+        this._repositories = this._register(( new DisposableMap()));
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostGitExtension));
         this._initializeDelegate();
     }

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

@@ -1385,6 +1385,7 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
             editKind: lifetimeSummary.editKind,
             longDistanceHintVisible: lifetimeSummary.longDistanceHintVisible,
             longDistanceHintDistance: lifetimeSummary.longDistanceHintDistance,
+            isForAnotherDocument: lifetimeSummary.isForAnotherDocument,
             ...forwardToChannelIf(isCopilotLikeExtension(this.providerId.extensionId))
         };
         const dataChannelForwardingTelemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);

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

@@ -248,7 +248,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2773, "Language Models"));
+        const accountLabel = auth.accountLabel ?? ( localize(3012, "Language Models"));
         const disposables = ( new DisposableStore());
         const provider = ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel));
         this._authenticationService.registerAuthenticationProvider(authProviderId, provider);
@@ -331,7 +331,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2774,
+            3013,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts

@@ -64,3 +64,45 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private loginPrompt;
     dispose(): void;
 }
+/**
+ * The context needed to re-acquire a token for a tracked MCP server, captured when the
+ * session was first established. The tracker holds this opaquely and replays it verbatim on
+ * re-validation so the silent token request targets the same authority / resource / audience
+ * that the original sign-in used. Dropping the authorization server here would let the provider
+ * fall back to a default authority (e.g. the Microsoft provider's `organizations` tenant) and
+ * request a token against the wrong tenant.
+ */
+export interface IMcpServerAuthContext {
+    readonly authorizationServer?: URI;
+    readonly clientId?: string;
+    readonly resource?: string;
+    readonly audience?: string;
+}
+/**
+ * Tracks which MCP servers are using which authentication providers.
+ * Organized by provider ID for efficient lookup when auth sessions change.
+ */
+export declare class McpServerAuthTracker {
+    private readonly _tracking;
+    /**
+     * Track authentication for a server with a specific provider.
+     * Replaces any existing tracking for this server/provider combination.
+     */
+    track(providerId: string, serverId: number, scopes: string[], context: IMcpServerAuthContext): void;
+    /**
+     * Remove all authentication tracking for a server across all providers.
+     */
+    untrack(serverId: number): void;
+    /**
+     * Get all servers using a specific authentication provider.
+     */
+    get(providerId: string): ReadonlyArray<{
+        serverId: number;
+        scopes: string[];
+        context: IMcpServerAuthContext;
+    }> | undefined;
+    /**
+     * Clear all tracking data.
+     */
+    clear(): void;
+}

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

@@ -20,7 +20,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 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, mcpOAuthClientSecretStorageKey, UserInteractionRequiredError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { McpServerLaunch, McpServerTransportType, McpServerDefinition, McpServerTrust, McpCollectionSortOrder, McpCollectionProvenance, 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';
@@ -108,7 +108,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 this._serverDefinitions.set(id, serverDefiniton);
                 proxy.$startMcp(id, {
                     launch: resolveLaunch,
-                    defaultCwd: serverDefiniton.variableReplacement?.folder?.uri,
+                    defaultCwd: serverDefiniton.defaultCwd ?? serverDefiniton.variableReplacement?.folder?.uri,
                     errorOnUserInteraction: options?.errorOnUserInteraction
                 });
                 return launch;
@@ -150,6 +150,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             const register = () => {
                 handle.value ??= this._mcpRegistry.registerCollection({
                     ...collection,
+                    provenance: McpCollectionProvenance.Extension,
                     source: extensionId,
                     order: McpCollectionSortOrder.Extension,
                     resolveServerLanch: collection.canResolveLaunch ? (async def => {
@@ -246,7 +247,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             const resource = authDetails.resourceMetadata?.resource;
             if (!resource) {
                 throw ( new Error(( localize(
-                    2775,
+                    3014,
                     "The enterprise-managed MCP server '{0}' did not advertise a protected-resource metadata document with a 'resource' identifier.",
                     server.label
                 ))));
@@ -255,7 +256,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             const audience = resourceAuthServers[0];
             if (!audience) {
                 throw ( new Error(( localize(
-                    2776,
+                    3015,
                     "The enterprise-managed MCP server '{0}' did not advertise an `authorization_servers` entry in its protected-resource metadata.",
                     server.label
                 ))));
@@ -342,7 +343,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         const configuredIssuer = config.issuer?.trim();
         if (!configuredIssuer) {
             throw ( new Error(( localize(
-                2777,
+                3016,
                 "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`."
             ))));
         }
@@ -351,14 +352,14 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             parsed = ( URI.parse(configuredIssuer));
         } catch {
             throw ( new Error(( localize(
-                2778,
+                3017,
                 "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(
-                2779,
+                3018,
                 "Enterprise-managed MCP authentication requires `mcp.enterpriseManagedAuth.idp.issuer` to use the `https` or `http` scheme; got '{0}'.",
                 configuredIssuer
             ))));
@@ -377,6 +378,12 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         audience,
         clientSecret
     ) {
+        const authContext = {
+            authorizationServer,
+            clientId,
+            resource,
+            audience
+        };
         const sessions = await this._authenticationService.getSessions(providerId, scopes, {
             authorizationServer,
             clientId,
@@ -409,12 +416,12 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                     server.id,
                     server.label
                 );
-                this._serverAuthTracking.track(providerId, serverId, scopes);
+                this._serverAuthTracking.track(providerId, serverId, scopes, authContext);
                 return matchingAccountPreferenceSession.accessToken;
             }
             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);
+                this._serverAuthTracking.track(providerId, serverId, scopes, authContext);
                 return sessions[0].accessToken;
             }
         }
@@ -455,14 +462,14 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         }]);
         this.authenticationMcpServersService.updateAccountPreference(server.id, providerId, session.account);
         this.authenticationMCPServerUsageService.addAccountUsage(providerId, session.account.label, scopes, server.id, server.label);
-        this._serverAuthTracking.track(providerId, serverId, scopes);
+        this._serverAuthTracking.track(providerId, serverId, scopes, authContext);
         return session.accessToken;
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2780, "Incorrect account detected")),
+            message: ( localize(3019, "Incorrect account detected")),
             detail: ( localize(
-                2781,
+                3020,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -470,10 +477,10 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2782, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(3021, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2783, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(3022, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -489,7 +496,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         }
         for (const {
             serverId,
-            scopes
+            scopes,
+            context
         } of serversUsingProvider) {
             const server = this._servers.get(serverId);
             const serverDefinition = this._serverDefinitions.get(serverId);
@@ -501,11 +509,21 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 continue;
             }
             try {
-                await this._getSessionForProvider(serverId, serverDefinition, providerId, scopes, undefined, true);
+                await this._getSessionForProvider(
+                    serverId,
+                    serverDefinition,
+                    providerId,
+                    scopes,
+                    context.authorizationServer,
+                    true,
+                    context.clientId,
+                    context.resource,
+                    context.audience
+                );
             } catch (e) {
                 if (UserInteractionRequiredError.is(e)) {
                     server.pushLog(LogLevel.Warning, ( localize(
-                        2784,
+                        3023,
                         "Authentication session for {0} removed, stopping server",
                         providerLabel
                     )));
@@ -552,18 +570,18 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession ? ( localize(
-            2785,
+            3024,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         )) : ( localize(
-            2786,
+            3025,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [{
-            label: ( localize(2787, "&&Allow")),
+            label: ( localize(3026, "&&Allow")),
             run() {
                 return true;
             }
@@ -649,12 +667,13 @@ class McpServerAuthTracker {
     constructor() {
         this._tracking = ( new Map());
     }
-    track(providerId, serverId, scopes) {
+    track(providerId, serverId, scopes, context) {
         const servers = this._tracking.get(providerId) || [];
         const filtered = servers.filter(s => s.serverId !== serverId);
         filtered.push({
             serverId,
-            scopes
+            scopes,
+            context
         });
         this._tracking.set(providerId, filtered);
     }
@@ -676,4 +695,4 @@ class McpServerAuthTracker {
     }
 }
 
-export { MainThreadMcp };
+export { MainThreadMcp, McpServerAuthTracker };

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(2788, "Extension"));
+                source = ( localize(3027, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2789, "Manage Extension")),
+                    label: ( localize(3028, "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(2790, "Cancel")),
+                    label: ( localize(3029, "Cancel")),
                     run: () => undefined
                 };
             } else {
                 cancelButton = {
-                    label: ( localize(2791, "&&OK")),
+                    label: ( localize(3030, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -33,6 +33,8 @@ let MainThreadNotebooks = class MainThreadNotebooks {
     dispose() {
         this._disposables.dispose();
         dispose(( this._notebookSerializer.values()));
+        dispose(( this._notebookCellStatusBarRegistrations.values()));
+        this._notebookCellStatusBarRegistrations.clear();
     }
     $registerNotebookSerializer(handle, extension, viewType, options, data) {
         const disposables = ( new DisposableStore());

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(2792, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(3031, "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(2793, "Show Output")),
+            name: ( localize(3032, "Show Output")),
             text: "$(output)",
-            ariaLabel: ( localize(2794, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(3033, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2795, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(3034, "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(2796, "Manage Extension")),
+                    label: ( localize(3035, "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(2797, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(3036, "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(2798, "{0}: {1}", source.label, task.name));
+        const label = ( localize(3037, "{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(