@codingame/monaco-vscode-authentication-service-override 37.6.1 → 38.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-authentication-service-override",
-  "version": "37.6.1",
+  "version": "38.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - authentication service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.6.1"
+    "@codingame/monaco-vscode-api": "38.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.js

@@ -16,8 +16,8 @@ class ManageAccountPreferencesForExtensionAction extends Action2 {
     constructor() {
         super({
             id: "_manageAccountPreferencesForExtension",
-            title: ( localize2(7369, "Manage Extension Account Preferences...")),
-            category: ( localize2(7370, "Accounts")),
+            title: ( localize2(8801, "Manage Extension Account Preferences...")),
+            category: ( localize2(8802, "Accounts")),
             f1: true,
             menu: [{
                 id: MenuId.AccountsContext,
@@ -56,8 +56,8 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                 label: ext.displayName ?? ext.name,
                 id: ext.identifier.value
             })), {
-                placeHolder: ( localize(7371, "Select an extension to manage account preferences for")),
-                title: ( localize(7372, "Manage Extension Account Preferences"))
+                placeHolder: ( localize(8803, "Select an extension to manage account preferences for")),
+                title: ( localize(8804, "Manage Extension Account Preferences"))
             });
             extensionId = result?.id;
         }
@@ -72,7 +72,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             const extensionQuery = this._authenticationQueryService.extension(extensionId);
             const providersWithAccess = await extensionQuery.getProvidersWithAccess();
             if (!providersWithAccess.length) {
-                await this._dialogService.info(( localize(7373, "This extension has not used any accounts yet.")));
+                await this._dialogService.info(( localize(8805, "This extension has not used any accounts yet.")));
                 return;
             }
             providerId = providersWithAccess[0];
@@ -82,10 +82,10 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                     id: providerId
                 })), {
                     placeHolder: ( localize(
-                        7374,
+                        8806,
                         "Select an authentication provider to manage account preferences for"
                     )),
-                    title: ( localize(7372, "Manage Extension Account Preferences"))
+                    title: ( localize(8804, "Manage Extension Account Preferences"))
                 });
                 if (!result) {
                     return;
@@ -108,7 +108,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                 items.push({
                     providerId,
                     scopes: lastUsedScopes,
-                    label: ( localize(7375, "Use a new account..."))
+                    label: ( localize(8807, "Use a new account..."))
                 });
             }
         }
@@ -134,12 +134,12 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             disposableStore.dispose();
         }));
         picker.placeholder = ( localize(
-            7376,
+            8808,
             "Manage '{0}' account preferences for {1}...",
             extensionLabel,
             providerLabel
         ));
-        picker.title = ( localize(7377, "'{0}' Account Preferences For This Workspace", extensionLabel));
+        picker.title = ( localize(8809, "'{0}' Account Preferences For This Workspace", extensionLabel));
         picker.sortByLabel = false;
         disposableStore.add(picker.onDidAccept(async () => {
             picker.hide();
@@ -152,7 +152,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             label: a.label,
             account: a,
             providerId,
-            description: ( localize(7378, "Current account")),
+            description: ( localize(8810, "Current account")),
             picked: true
         } : {
             label: a.label,
@@ -161,7 +161,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
         });
     }
     _handleNoAccounts(picker) {
-        picker.validationMessage = ( localize(7379, "No accounts are currently used by this extension."));
+        picker.validationMessage = ( localize(8811, "No accounts are currently used by this extension."));
         picker.buttons = [this._quickInputService.backButton];
         picker.show();
         return Event.filter(picker.onDidTriggerButton, e => e === this._quickInputService.backButton)(() => this.run());

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForMcpServerAction.js

@@ -16,8 +16,8 @@ class ManageAccountPreferencesForMcpServerAction extends Action2 {
     constructor() {
         super({
             id: "_manageAccountPreferencesForMcpServer",
-            title: ( localize2(7380, "Manage MCP Server Account Preferences")),
-            category: ( localize2(7381, "Accounts")),
+            title: ( localize2(8812, "Manage MCP Server Account Preferences")),
+            category: ( localize2(8813, "Accounts")),
             f1: false
         });
     }
@@ -53,7 +53,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             const mcpServerQuery = this._authenticationQueryService.mcpServer(mcpServerId);
             const providersWithAccess = await mcpServerQuery.getProvidersWithAccess();
             if (!providersWithAccess.length) {
-                await this._dialogService.info(( localize(7382, "This MCP server has not used any accounts yet.")));
+                await this._dialogService.info(( localize(8814, "This MCP server has not used any accounts yet.")));
                 return;
             }
             providerId = providersWithAccess[0];
@@ -63,10 +63,10 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                     id: providerId
                 })), {
                     placeHolder: ( localize(
-                        7383,
+                        8815,
                         "Select an authentication provider to manage account preferences for"
                     )),
-                    title: ( localize(7384, "Manage MCP Server Account Preferences"))
+                    title: ( localize(8816, "Manage MCP Server Account Preferences"))
                 });
                 if (!result) {
                     return;
@@ -89,7 +89,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                 items.push({
                     providerId: providerId,
                     scopes: lastUsedScopes,
-                    label: ( localize(7385, "Use a new account..."))
+                    label: ( localize(8817, "Use a new account..."))
                 });
             }
         }
@@ -110,12 +110,12 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             disposableStore.dispose();
         }));
         picker.placeholder = ( localize(
-            7386,
+            8818,
             "Manage '{0}' account preferences for {1}...",
             mcpServerLabel,
             providerLabel
         ));
-        picker.title = ( localize(7387, "'{0}' Account Preferences For This Workspace", mcpServerLabel));
+        picker.title = ( localize(8819, "'{0}' Account Preferences For This Workspace", mcpServerLabel));
         picker.sortByLabel = false;
         disposableStore.add(picker.onDidAccept(async () => {
             picker.hide();
@@ -128,7 +128,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             label: a.label,
             account: a,
             providerId,
-            description: ( localize(7388, "Current account")),
+            description: ( localize(8820, "Current account")),
             picked: true
         } : {
             label: a.label,
@@ -137,7 +137,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
         });
     }
     _handleNoAccounts(picker) {
-        picker.validationMessage = ( localize(7389, "No accounts are currently used by this MCP server."));
+        picker.validationMessage = ( localize(8821, "No accounts are currently used by this MCP server."));
         picker.buttons = [this._quickInputService.backButton];
         picker.show();
         return Event.filter(picker.onDidTriggerButton, e => e === this._quickInputService.backButton)(() => this.run());

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageAccountsAction.js

@@ -16,8 +16,8 @@ class ManageAccountsAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.manageAccounts",
-            title: ( localize2(7390, "Manage Accounts")),
-            category: ( localize2(7391, "Accounts")),
+            title: ( localize2(8822, "Manage Accounts")),
+            category: ( localize2(8823, "Accounts")),
             f1: true
         });
     }
@@ -41,11 +41,11 @@ let ManageAccountsActionImpl = class ManageAccountsActionImpl {
         this.productService = productService;
     }
     async run() {
-        const placeHolder = ( localize(7392, "Select an account to manage"));
+        const placeHolder = ( localize(8824, "Select an account to manage"));
         const accounts = await this.listAccounts();
         if (!accounts.length) {
             await this.quickInputService.pick([{
-                label: ( localize(7393, "There are no active accounts."))
+                label: ( localize(8825, "There are no active accounts."))
             }], {
                 placeHolder
             });
@@ -98,11 +98,11 @@ let ManageAccountsActionImpl = class ManageAccountsActionImpl {
         } = account;
         const store = ( new DisposableStore());
         const quickPick = store.add(this.quickInputService.createQuickPick());
-        quickPick.title = ( localize(7394, "Manage '{0}'", accountLabel));
-        quickPick.placeholder = ( localize(7395, "Select an action"));
+        quickPick.title = ( localize(8826, "Manage '{0}'", accountLabel));
+        quickPick.placeholder = ( localize(8827, "Select an action"));
         quickPick.buttons = [this.quickInputService.backButton];
         const items = [{
-            label: ( localize(7396, "Manage Trusted Extensions")),
+            label: ( localize(8828, "Manage Trusted Extensions")),
             action: () => this.commandService.executeCommand("_manageTrustedExtensionsForAccount", {
                 providerId,
                 accountLabel
@@ -110,7 +110,7 @@ let ManageAccountsActionImpl = class ManageAccountsActionImpl {
         }];
         if (canUseMcp) {
             items.push({
-                label: ( localize(7397, "Manage Trusted MCP Servers")),
+                label: ( localize(8829, "Manage Trusted MCP Servers")),
                 action: () => this.commandService.executeCommand("_manageTrustedMCPServersForAccount", {
                     providerId,
                     accountLabel
@@ -119,7 +119,7 @@ let ManageAccountsActionImpl = class ManageAccountsActionImpl {
         }
         if (await canSignOut()) {
             items.push({
-                label: ( localize(7398, "Sign Out")),
+                label: ( localize(8830, "Sign Out")),
                 action: () => this.commandService.executeCommand("_signOutOfAccount", {
                     providerId,
                     accountLabel

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageDynamicAuthenticationProvidersAction.js

@@ -13,8 +13,8 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
     constructor() {
         super({
             id: RemoveDynamicAuthenticationProvidersAction.ID,
-            title: ( localize2(7399, "Remove Dynamic Authentication Providers")),
-            category: ( localize2(7400, "Authentication")),
+            title: ( localize2(8831, "Remove Dynamic Authentication Providers")),
+            category: ( localize2(8832, "Authentication")),
             f1: true
         });
     }
@@ -25,16 +25,16 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         const dialogService = accessor.get(IDialogService);
         const interactedProviders = dynamicAuthStorageService.getInteractedProviders();
         if (interactedProviders.length === 0) {
-            await dialogService.info(( localize(7401, "No dynamic authentication providers")), ( localize(7402, "No dynamic authentication providers have been used yet.")));
+            await dialogService.info(( localize(8833, "No dynamic authentication providers")), ( localize(8834, "No dynamic authentication providers have been used yet.")));
             return;
         }
         const items = interactedProviders.map(provider => ({
             label: provider.label,
-            description: ( localize(7403, "Client ID: {0}", provider.clientId)),
+            description: ( localize(8835, "Client ID: {0}", provider.clientId)),
             provider
         }));
         const selected = await quickInputService.pick(items, {
-            placeHolder: ( localize(7404, "Select a dynamic authentication provider to remove")),
+            placeHolder: ( localize(8836, "Select a dynamic authentication provider to remove")),
             canPickMany: true
         });
         if (!selected || selected.length === 0) {
@@ -42,11 +42,11 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         }
         const providerNames = selected.map(item => item.provider.label).join(", ");
         const message = selected.length === 1 ? ( localize(
-            7405,
+            8837,
             "Are you sure you want to remove the dynamic authentication provider \"{0}\"?",
             providerNames
         )) : ( localize(
-            7406,
+            8838,
             "Are you sure you want to remove {0} dynamic authentication providers: {1}?",
             selected.length,
             providerNames
@@ -54,10 +54,10 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         const result = await dialogService.confirm({
             message,
             detail: ( localize(
-                7407,
+                8839,
                 "This will remove all stored authentication data for the selected provider(s). You will need to re-authenticate if you use these providers again."
             )),
-            primaryButton: ( localize(7408, "Remove")),
+            primaryButton: ( localize(8840, "Remove")),
             type: "warning"
         });
         if (!result.confirmed) {

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.js

@@ -19,8 +19,8 @@ class ManageTrustedExtensionsForAccountAction extends Action2 {
     constructor() {
         super({
             id: "_manageTrustedExtensionsForAccount",
-            title: ( localize2(7409, "Manage Trusted Extensions For Account")),
-            category: ( localize2(7410, "Accounts")),
+            title: ( localize2(8841, "Manage Trusted Extensions For Account")),
+            category: ( localize2(8842, "Accounts")),
             f1: true
         });
     }
@@ -47,11 +47,11 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         this._commandService = _commandService;
         this._extensionsWorkbenchService = _extensionsWorkbenchService;
         this._viewDetailsButton = {
-            tooltip: ( localize(7411, "View extension details")),
+            tooltip: ( localize(8843, "View extension details")),
             iconClass: ThemeIcon.asClassName(Codicon.info)
         };
         this._managePreferencesButton = {
-            tooltip: ( localize(7412, "Manage account preferences for this extension")),
+            tooltip: ( localize(8844, "Manage account preferences for this extension")),
             iconClass: ThemeIcon.asClassName(Codicon.settingsGear)
         };
     }
@@ -75,7 +75,7 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         }
         const accounts = await this._getAllAvailableAccounts();
         const pick = await this._quickInputService.pick(accounts, {
-            placeHolder: ( localize(7413, "Pick an account to manage trusted extensions for")),
+            placeHolder: ( localize(8845, "Pick an account to manage trusted extensions for")),
             matchOnDescription: true
         });
         return pick ? this._authenticationQueryService.provider(pick.providerId).account(pick.label) : undefined;
@@ -117,7 +117,7 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
             };
         });
         if (!filteredExtensions.length) {
-            this._dialogService.info(( localize(7414, "This account has not been used by any extensions.")));
+            this._dialogService.info(( localize(8846, "This account has not been used by any extensions.")));
             return [];
         }
         const trustedExtensions = filteredExtensions.filter(e => e.trusted);
@@ -126,17 +126,17 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         const _toQuickPickItem = this._toQuickPickItem.bind(this);
         return [...otherExtensions.sort(sortByLastUsed).map(_toQuickPickItem), {
             type: "separator",
-            label: ( localize(7415, "Trusted by Microsoft"))
+            label: ( localize(8847, "Trusted by Microsoft"))
         }, ...trustedExtensions.sort(sortByLastUsed).map(_toQuickPickItem)];
     }
     _toQuickPickItem(extension) {
         const lastUsed = extension.lastUsed;
-        const description = lastUsed ? ( localize(7416, "Last used this account {0}", fromNow(lastUsed, true))) : ( localize(7417, "Has not used this account"));
+        const description = lastUsed ? ( localize(8848, "Last used this account {0}", fromNow(lastUsed, true))) : ( localize(8849, "Has not used this account"));
         let tooltip;
         let disabled;
         if (extension.trusted) {
             tooltip = ( localize(
-                7418,
+                8850,
                 "This extension is trusted by Microsoft and\nalways has access to this account"
             ));
             disabled = true;
@@ -158,10 +158,10 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         }));
         quickPick.canSelectMany = true;
         quickPick.customButton = true;
-        quickPick.customLabel = ( localize(7419, "Cancel"));
+        quickPick.customLabel = ( localize(8851, "Cancel"));
         quickPick.customButtonSecondary = true;
-        quickPick.title = ( localize(7420, "Manage Trusted Extensions"));
-        quickPick.placeholder = ( localize(7421, "Choose which extensions can access this account"));
+        quickPick.title = ( localize(8852, "Manage Trusted Extensions"));
+        quickPick.placeholder = ( localize(8853, "Choose which extensions can access this account"));
         disposableStore.add(quickPick.onDidAccept(() => {
             const updatedAllowedList = quickPick.items.filter(item => item.type !== "separator").map(i => i.extension);
             const allowedExtensionsSet = ( new Set(quickPick.selectedItems.map(i => i.extension)));

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedMcpServersForAccountAction.js

@@ -20,8 +20,8 @@ class ManageTrustedMcpServersForAccountAction extends Action2 {
     constructor() {
         super({
             id: "_manageTrustedMCPServersForAccount",
-            title: ( localize2(7422, "Manage Trusted MCP Servers For Account")),
-            category: ( localize2(7423, "Accounts")),
+            title: ( localize2(8854, "Manage Trusted MCP Servers For Account")),
+            category: ( localize2(8855, "Accounts")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
         });
@@ -67,7 +67,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         }
         const accounts = await this._getAllAvailableAccounts();
         const pick = await this._quickInputService.pick(accounts, {
-            placeHolder: ( localize(7424, "Pick an account to manage trusted MCP servers for")),
+            placeHolder: ( localize(8856, "Pick an account to manage trusted MCP servers for")),
             matchOnDescription: true
         });
         return pick ? this._authenticationQueryService.provider(pick.providerId).account(pick.label) : undefined;
@@ -109,7 +109,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
             name: serverIdToLabel.get(server.id)
         }));
         if (!agentHostServers.length && !workbenchServers.length) {
-            this._dialogService.info(( localize(7425, "This account has not been used by any MCP servers.")));
+            this._dialogService.info(( localize(8857, "This account has not been used by any MCP servers.")));
             return [];
         }
         const trustedServers = workbenchServers.filter(s => s.trusted);
@@ -132,25 +132,25 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         } of sortedGroups) {
             items.push({
                 type: "separator",
-                label: ( localize(7426, "MCP Servers in {0}", label))
+                label: ( localize(8858, "MCP Servers in {0}", label))
             });
             items.push(...servers.sort(sortByLastUsed).map(this._toQuickPickItem));
         }
         items.push({
             type: "separator",
-            label: ( localize(7427, "Trusted by Microsoft"))
+            label: ( localize(8859, "Trusted by Microsoft"))
         });
         items.push(...trustedServers.sort(sortByLastUsed).map(this._toQuickPickItem));
         return items;
     }
     _toQuickPickItem(mcpServer) {
         const lastUsed = mcpServer.lastUsed;
-        const description = lastUsed ? ( localize(7428, "Last used this account {0}", fromNow(lastUsed, true))) : ( localize(7429, "Has not used this account"));
+        const description = lastUsed ? ( localize(8860, "Last used this account {0}", fromNow(lastUsed, true))) : ( localize(8861, "Has not used this account"));
         let tooltip;
         let disabled;
         if (mcpServer.trusted) {
             tooltip = ( localize(
-                7430,
+                8862,
                 "This MCP server is trusted by Microsoft and\nalways has access to this account"
             ));
             disabled = true;
@@ -162,7 +162,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
             tooltip,
             disabled,
             buttons: [{
-                tooltip: ( localize(7431, "Manage account preferences for this MCP server")),
+                tooltip: ( localize(8863, "Manage account preferences for this MCP server")),
                 iconClass: ThemeIcon.asClassName(Codicon.settingsGear)
             }],
             picked: mcpServer.allowed === undefined || mcpServer.allowed
@@ -175,10 +175,10 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         }));
         quickPick.canSelectMany = true;
         quickPick.customButton = true;
-        quickPick.customLabel = ( localize(7432, "Cancel"));
+        quickPick.customLabel = ( localize(8864, "Cancel"));
         quickPick.customButtonSecondary = true;
-        quickPick.title = ( localize(7433, "Manage Trusted MCP Servers"));
-        quickPick.placeholder = ( localize(7434, "Choose which MCP servers can access this account"));
+        quickPick.title = ( localize(8865, "Manage Trusted MCP Servers"));
+        quickPick.placeholder = ( localize(8866, "Choose which MCP servers can access this account"));
         disposableStore.add(quickPick.onDidAccept(() => {
             quickPick.hide();
             const allServers = quickPick.items.filter(item => item.type !== "separator").map(i => i.mcpServer);

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/signOutOfAccountAction.js

@@ -11,7 +11,7 @@ class SignOutOfAccountAction extends Action2 {
     constructor() {
         super({
             id: "_signOutOfAccount",
-            title: ( localize(7435, "Sign out of account")),
+            title: ( localize(8867, "Sign out of account")),
             f1: false
         });
     }
@@ -39,12 +39,12 @@ class SignOutOfAccountAction extends Action2 {
         } = await dialogService.confirm({
             type: Severity.Info,
             message: accountUsages.length ? ( localize(
-                7436,
+                8868,
                 "The account '{0}' has been used by: \n\n{1}\n\n Sign out from these extensions?",
                 accountLabel,
                 accountUsages.map(usage => usage.extensionName).join("\n")
-            )) : ( localize(7437, "Sign out of '{0}'?", accountLabel)),
-            primaryButton: ( localize(7438, "&&Sign Out"))
+            )) : ( localize(8869, "Sign out of '{0}'?", accountLabel)),
+            primaryButton: ( localize(8870, "&&Sign Out"))
         });
         if (confirmed) {
             const removeSessionPromises = sessions.map(session => authenticationService.removeSession(providerId, session.id));

package/vscode/src/vs/workbench/contrib/authentication/browser/authentication.contribution.js

@@ -41,7 +41,7 @@ class AuthenticationDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7439, "Label")), ( localize(7440, "ID")), ( localize(7441, "MCP Authorization Servers"))];
+        const headers = [( localize(8871, "Label")), ( localize(8872, "ID")), ( localize(8873, "MCP Authorization Servers"))];
         const rows = authentication.sort((a, b) => a.label.localeCompare(b.label)).map(auth => {
             return [auth.label, auth.id, (auth.authorizationServerGlobs ?? []).join(",\n")];
         });
@@ -56,7 +56,7 @@ class AuthenticationDataRenderer extends Disposable {
 }
 const extensionFeature = ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "authentication",
-    label: ( localize(7442, "Authentication")),
+    label: ( localize(8874, "Authentication")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.d.ts

@@ -5,10 +5,11 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service";
 import { IAuthenticationAccessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service";
 import { IAuthenticationUsageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service";
-import { AuthenticationSession, AuthenticationSessionAccount, IAuthenticationWwwAuthenticateRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
+import { AuthenticationSession, AuthenticationSessionAccount, IAuthenticationWwwAuthenticateRequest, IAuthenticationProviderSessionOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
 import { IAuthenticationExtensionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export declare class AuthenticationExtensionsService extends Disposable implements IAuthenticationExtensionsService {
     private readonly activityService;
     private readonly storageService;
@@ -18,8 +19,10 @@ export declare class AuthenticationExtensionsService extends Disposable implemen
     private readonly _authenticationService;
     private readonly _authenticationUsageService;
     private readonly _authenticationAccessService;
+    private readonly _logService;
     readonly _serviceBrand: undefined;
     private _signInRequestItems;
+    private readonly _signInRequestUpdates;
     private _sessionAccessRequestItems;
     private readonly _accountBadgeDisposable;
     private _onDidAccountPreferenceChange;
@@ -29,12 +32,20 @@ export declare class AuthenticationExtensionsService extends Disposable implemen
     }>;
     private _inheritAuthAccountPreferenceParentToChildren;
     private _inheritAuthAccountPreferenceChildToParent;
-    constructor(activityService: IActivityService, storageService: IStorageService, dialogService: IDialogService, quickInputService: IQuickInputService, _productService: IProductService, _authenticationService: IAuthenticationService, _authenticationUsageService: IAuthenticationUsageService, _authenticationAccessService: IAuthenticationAccessService);
+    constructor(activityService: IActivityService, storageService: IStorageService, dialogService: IDialogService, quickInputService: IQuickInputService, _productService: IProductService, _authenticationService: IAuthenticationService, _authenticationUsageService: IAuthenticationUsageService, _authenticationAccessService: IAuthenticationAccessService, _logService: ILogService);
     private registerListeners;
-    updateNewSessionRequests(providerId: string, addedSessions: readonly AuthenticationSession[]): void;
+    dispose(): void;
+    private clearProviderRequests;
+    updateNewSessionRequests(providerId: string, addedSessions: readonly AuthenticationSession[]): Promise<void>;
+    private isCurrentSignInRequest;
+    private revalidateSignInRequest;
+    private hasSessionForRequest;
+    private completeSignInRequest;
     private updateAccessRequests;
     private updateBadgeCount;
+    private accessRequestKey;
     private removeAccessRequest;
+    private removeAllowedAccessRequests;
     updateAccountPreference(extensionId: string, providerId: string, account: AuthenticationSessionAccount): void;
     getAccountPreference(extensionId: string, providerId: string): string | undefined;
     removeAccountPreference(extensionId: string, providerId: string): void;
@@ -47,8 +58,8 @@ export declare class AuthenticationExtensionsService extends Disposable implemen
     /**
      * This function should be used only when there are sessions to disambiguate.
      */
-    selectSession(providerId: string, extensionId: string, extensionName: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, availableSessions: AuthenticationSession[]): Promise<AuthenticationSession>;
+    selectSession(providerId: string, extensionId: string, extensionName: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, availableSessions: readonly AuthenticationSession[], options?: IAuthenticationProviderSessionOptions): Promise<AuthenticationSession>;
     private completeSessionAccessRequest;
-    requestSessionAccess(providerId: string, extensionId: string, extensionName: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, possibleSessions: AuthenticationSession[]): void;
-    requestNewSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, extensionId: string, extensionName: string): Promise<void>;
+    requestSessionAccess(providerId: string, extensionId: string, extensionName: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, possibleSessions: readonly AuthenticationSession[], options?: IAuthenticationProviderSessionOptions): void;
+    requestNewSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, extensionId: string, extensionName: string, options?: IAuthenticationProviderSessionOptions): Promise<void>;
 }

package/vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.js

@@ -1,7 +1,10 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, MutableDisposable, dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { SequencerByKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { onUnexpectedError, CancellationError, isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { scopesMatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/oauth';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
@@ -15,11 +18,12 @@ import { NumberBadge } from '@codingame/monaco-vscode-api/vscode/vs/workbench/se
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
-import { isAuthenticationWwwAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
+import { isAuthenticationWwwAuthenticateRequest, getAuthenticationSessionRequestKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 const SCOPESLIST_SEPARATOR = " ";
@@ -32,7 +36,8 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         _productService,
         _authenticationService,
         _authenticationUsageService,
-        _authenticationAccessService
+        _authenticationAccessService,
+        _logService
     ) {
         super();
         this.activityService = activityService;
@@ -43,7 +48,9 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this._authenticationService = _authenticationService;
         this._authenticationUsageService = _authenticationUsageService;
         this._authenticationAccessService = _authenticationAccessService;
+        this._logService = _logService;
         this._signInRequestItems = ( new Map());
+        this._signInRequestUpdates = ( new SequencerByKey());
         this._sessionAccessRequestItems = ( new Map());
         this._accountBadgeDisposable = this._register(( new MutableDisposable()));
         this._onDidAccountPreferenceChange = this._register(( new Emitter()));
@@ -60,51 +67,94 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
     registerListeners() {
         this._register(this._authenticationService.onDidChangeSessions(e => {
             if (e.event.added?.length) {
-                this.updateNewSessionRequests(e.providerId, e.event.added);
+                void this.updateNewSessionRequests(e.providerId, e.event.added).catch(onUnexpectedError);
             }
             if (e.event.removed?.length) {
                 this.updateAccessRequests(e.providerId, e.event.removed);
             }
         }));
         this._register(this._authenticationService.onDidUnregisterAuthenticationProvider(e => {
-            const accessRequests = this._sessionAccessRequestItems.get(e.id) || {};
-            ( Object.keys(accessRequests)).forEach(extensionId => {
-                this.removeAccessRequest(e.id, extensionId);
-            });
+            this.clearProviderRequests(e.id);
+            this.updateBadgeCount();
         }));
     }
+    dispose() {
+        for (const providerId of ( new Set([...( this._signInRequestItems.keys()), ...( this._sessionAccessRequestItems.keys())]))) {
+            this.clearProviderRequests(providerId);
+        }
+        super.dispose();
+    }
+    clearProviderRequests(providerId) {
+        for (const request of [...( Object.values(this._signInRequestItems.get(providerId) ?? {})), ...( Object.values(this._sessionAccessRequestItems.get(providerId) ?? {}))]) {
+            dispose(request.disposables);
+        }
+        this._signInRequestItems.delete(providerId);
+        this._sessionAccessRequestItems.delete(providerId);
+    }
     updateNewSessionRequests(providerId, addedSessions) {
-        const existingRequestsForProvider = this._signInRequestItems.get(providerId);
-        if (!existingRequestsForProvider) {
+        const providerRequests = this._signInRequestItems.get(providerId);
+        if (!providerRequests || this._store.isDisposed) {
+            return Promise.resolve();
+        }
+        const requests = Object.entries(providerRequests);
+        return this._signInRequestUpdates.queue(providerRequests, async () => {
+            for (const [requestKey, request] of requests) {
+                await this.revalidateSignInRequest(providerId, providerRequests, requestKey, request, addedSessions);
+            }
+        });
+    }
+    isCurrentSignInRequest(providerId, providerRequests, requestKey, request) {
+        return !this._store.isDisposed && this._signInRequestItems.get(providerId) === providerRequests && providerRequests[requestKey] === request;
+    }
+    async revalidateSignInRequest(providerId, providerRequests, requestKey, request, addedSessions) {
+        if (!this.isCurrentSignInRequest(providerId, providerRequests, requestKey, request)) {
             return;
         }
-        ( Object.keys(existingRequestsForProvider)).forEach(requestedScopes => {
-            const requestedScopesArray = requestedScopes.split(SCOPESLIST_SEPARATOR);
-            if (( addedSessions.some(session => scopesMatch(session.scopes, requestedScopesArray)))) {
-                const sessionRequest = existingRequestsForProvider[requestedScopes];
-                sessionRequest?.disposables.forEach(item => item.dispose());
-                delete existingRequestsForProvider[requestedScopes];
-                if (( Object.keys(existingRequestsForProvider)).length === 0) {
-                    this._signInRequestItems.delete(providerId);
-                } else {
-                    this._signInRequestItems.set(providerId, existingRequestsForProvider);
-                }
-                this.updateBadgeCount();
+        try {
+            if (await this.hasSessionForRequest(providerId, request, addedSessions)) {
+                this.completeSignInRequest(providerId, providerRequests, requestKey, request);
             }
+        } catch (error) {
+            if (this.isCurrentSignInRequest(providerId, providerRequests, requestKey, request)) {
+                this._logService.warn(
+                    `Failed to check a pending authentication request for '${providerId}'.`,
+                    error
+                );
+            }
+        }
+    }
+    async hasSessionForRequest(providerId, request, addedSessions) {
+        const {
+            scopeListOrRequest,
+            options
+        } = request;
+        if (!isAuthenticationWwwAuthenticateRequest(scopeListOrRequest) && !( addedSessions.some(session => scopesMatch(session.scopes, scopeListOrRequest)))) {
+            return false;
+        }
+        const sessions = await this._authenticationService.getSessions(providerId, scopeListOrRequest, {
+            ...options,
+            silent: true
         });
+        return sessions.length > 0;
+    }
+    completeSignInRequest(providerId, providerRequests, requestKey, request) {
+        if (!this.isCurrentSignInRequest(providerId, providerRequests, requestKey, request)) {
+            return;
+        }
+        delete providerRequests[requestKey];
+        if (( Object.keys(providerRequests)).length === 0) {
+            this._signInRequestItems.delete(providerId);
+        }
+        dispose(request.disposables);
+        this.updateBadgeCount();
     }
     updateAccessRequests(providerId, removedSessions) {
         const providerRequests = this._sessionAccessRequestItems.get(providerId);
         if (providerRequests) {
-            ( Object.keys(providerRequests)).forEach(extensionId => {
-                removedSessions.forEach(removed => {
-                    const indexOfSession = providerRequests[extensionId].possibleSessions.findIndex(session => session.id === removed.id);
-                    if (indexOfSession) {
-                        providerRequests[extensionId].possibleSessions.splice(indexOfSession, 1);
-                    }
-                });
-                if (!providerRequests[extensionId].possibleSessions.length) {
-                    this.removeAccessRequest(providerId, extensionId);
+            Object.entries(providerRequests).forEach(([requestKey, request]) => {
+                request.possibleSessions = request.possibleSessions.filter(session => !( removedSessions.some(removed => removed.id === session.id)));
+                if (!request.possibleSessions.length) {
+                    this.removeAccessRequest(providerId, requestKey);
                 }
             });
         }
@@ -121,20 +171,39 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(21678, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(24253, "Sign in requested"))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({
                 badge
             });
         }
     }
-    removeAccessRequest(providerId, extensionId) {
+    accessRequestKey(extensionId, scopeListOrRequest, options) {
+        return JSON.stringify([
+            extensionId,
+            getAuthenticationSessionRequestKey(scopeListOrRequest, options)
+        ]);
+    }
+    removeAccessRequest(providerId, requestKey) {
         const providerRequests = this._sessionAccessRequestItems.get(providerId) || {};
-        if (providerRequests[extensionId]) {
-            dispose(providerRequests[extensionId].disposables);
-            delete providerRequests[extensionId];
+        if (providerRequests[requestKey]) {
+            dispose(providerRequests[requestKey].disposables);
+            delete providerRequests[requestKey];
+            if (( Object.keys(providerRequests)).length === 0) {
+                this._sessionAccessRequestItems.delete(providerId);
+            }
             this.updateBadgeCount();
         }
     }
+    removeAllowedAccessRequests(providerId, extensionId, accountName) {
+        if (!this._authenticationAccessService.isAccessAllowed(providerId, accountName, extensionId)) {
+            return;
+        }
+        for (const [requestKey, request] of Object.entries(this._sessionAccessRequestItems.get(providerId) ?? {})) {
+            if (request.extensionId === extensionId && ( request.possibleSessions.some(session => session.account.label === accountName))) {
+                this.removeAccessRequest(providerId, requestKey);
+            }
+        }
+    }
     updateAccountPreference(extensionId, providerId, account) {
         const realExtensionId = ExtensionIdentifier.toKey(extensionId);
         const parentExtensionId = this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId;
@@ -143,6 +212,9 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this.storageService.store(key, account.label, StorageScope.APPLICATION, StorageTarget.MACHINE);
         const childrenExtensions = this._inheritAuthAccountPreferenceParentToChildren[parentExtensionId];
         const extensionIds = childrenExtensions ? [parentExtensionId, ...childrenExtensions] : [parentExtensionId];
+        for (const id of extensionIds) {
+            this.removeAllowedAccessRequests(providerId, id, account.label);
+        }
         this._onDidAccountPreferenceChange.fire({
             extensionIds,
             providerId
@@ -189,7 +261,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this.updateAccountPreference(extensionId, providerId, session.account);
         this.updateSessionPreference(providerId, extensionId, session);
     }
-    async showGetSessionPrompt(provider, accountName, extensionId, extensionName) {
+    async showGetSessionPrompt(provider, accountName, extensionId, extensionName, requestKey) {
         let SessionPromptChoice;
         (function(SessionPromptChoice) {
             SessionPromptChoice[SessionPromptChoice["Allow"] = 0] = "Allow";
@@ -201,17 +273,17 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                21679,
+                24254,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
                 accountName
             )),
             buttons: [{
-                label: ( localize(21680, "&&Allow")),
+                label: ( localize(24255, "&&Allow")),
                 run: () => SessionPromptChoice.Allow
             }, {
-                label: ( localize(21681, "&&Deny")),
+                label: ( localize(24256, "&&Deny")),
                 run: () => SessionPromptChoice.Deny
             }],
             cancelButton: {
@@ -224,7 +296,10 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 name: extensionName,
                 allowed: result === SessionPromptChoice.Allow
             }]);
-            this.removeAccessRequest(provider.id, extensionId);
+            this.removeAccessRequest(provider.id, requestKey);
+            if (result === SessionPromptChoice.Allow) {
+                this.removeAllowedAccessRequests(provider.id, extensionId, accountName);
+            }
         }
         return result === SessionPromptChoice.Allow;
     }
@@ -233,7 +308,8 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         extensionId,
         extensionName,
         scopeListOrRequest,
-        availableSessions
+        availableSessions,
+        options = {}
     ) {
         const allAccounts = await this._authenticationService.getAccounts(providerId);
         if (!allAccounts.length) {
@@ -259,17 +335,17 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             }
         });
         items.push({
-            label: ( localize(21682, "Sign in to another account"))
+            label: ( localize(24257, "Sign in to another account"))
         });
         quickPick.items = items;
         quickPick.title = ( localize(
-            21683,
+            24258,
             "The extension '{0}' wants to access a {1} account",
             extensionName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            21684,
+            24259,
             "Select an account for '{0}' to use or Esc to cancel",
             extensionName
         ));
@@ -281,6 +357,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                     const account = quickPick.selectedItems[0].account;
                     try {
                         session = await this._authenticationService.createSession(providerId, scopeListOrRequest, {
+                            ...options,
                             account
                         });
                     } catch (e) {
@@ -295,28 +372,36 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                     allowed: true
                 }]);
                 this._updateAccountAndSessionPreferences(providerId, extensionId, session);
-                this.removeAccessRequest(providerId, extensionId);
+                this.removeAccessRequest(
+                    providerId,
+                    this.accessRequestKey(extensionId, scopeListOrRequest, options)
+                );
                 resolve(session);
             }));
             disposables.add(quickPick.onDidHide(_ => {
                 if (!quickPick.selectedItems[0]) {
-                    reject("User did not consent to account access");
+                    reject(( new CancellationError()));
                 }
                 disposables.dispose();
             }));
             quickPick.show();
         }));
     }
-    async completeSessionAccessRequest(provider, extensionId, extensionName, scopeListOrRequest) {
+    async completeSessionAccessRequest(provider, requestKey, extensionName) {
         const providerRequests = this._sessionAccessRequestItems.get(provider.id) || {};
-        const existingRequest = providerRequests[extensionId];
+        const existingRequest = providerRequests[requestKey];
         if (!existingRequest) {
             return;
         }
         if (!provider) {
             return;
         }
-        const possibleSessions = existingRequest.possibleSessions;
+        const {
+            possibleSessions,
+            extensionId,
+            scopeListOrRequest,
+            options
+        } = existingRequest;
         let session;
         if (provider.supportsMultipleAccounts) {
             try {
@@ -325,11 +410,22 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                     extensionId,
                     extensionName,
                     scopeListOrRequest,
-                    possibleSessions
+                    possibleSessions,
+                    options
                 );
-            } catch (_) {}
+            } catch (error) {
+                if (!isCancellationError(error)) {
+                    throw error;
+                }
+            }
         } else {
-            const approved = await this.showGetSessionPrompt(provider, possibleSessions[0].account.label, extensionId, extensionName);
+            const approved = await this.showGetSessionPrompt(
+                provider,
+                possibleSessions[0].account.label,
+                extensionId,
+                extensionName,
+                requestKey
+            );
             if (approved) {
                 session = possibleSessions[0];
             }
@@ -342,6 +438,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 extensionId,
                 extensionName
             );
+            this.removeAccessRequest(provider.id, requestKey);
         }
     }
     requestSessionAccess(
@@ -349,35 +446,39 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         extensionId,
         extensionName,
         scopeListOrRequest,
-        possibleSessions
+        possibleSessions,
+        options = {}
     ) {
         const providerRequests = this._sessionAccessRequestItems.get(providerId) || {};
-        const hasExistingRequest = providerRequests[extensionId];
+        const requestKey = this.accessRequestKey(extensionId, scopeListOrRequest, options);
+        const hasExistingRequest = providerRequests[requestKey];
         if (hasExistingRequest) {
             return;
         }
         const provider = this._authenticationService.getProvider(providerId);
+        const commandId = `${providerId}:${extensionId}:access:${generateUuid()}`;
         const menuItem = ( MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
             group: "3_accessRequests",
             command: {
-                id: `${providerId}${extensionId}Access`,
-                title: ( localize(21685, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
+                id: commandId,
+                title: ( localize(24260, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
-            id: `${providerId}${extensionId}Access`,
-            handler: async accessor => {
-                this.completeSessionAccessRequest(provider, extensionId, extensionName, scopeListOrRequest);
-            }
+            id: commandId,
+            handler: () => this.completeSessionAccessRequest(provider, requestKey, extensionName)
         });
-        providerRequests[extensionId] = {
-            possibleSessions,
+        providerRequests[requestKey] = {
+            extensionId,
+            scopeListOrRequest,
+            options,
+            possibleSessions: [...possibleSessions],
             disposables: [menuItem, accessCommand]
         };
         this._sessionAccessRequestItems.set(providerId, providerRequests);
         this.updateBadgeCount();
     }
-    async requestNewSession(providerId, scopeListOrRequest, extensionId, extensionName) {
+    async requestNewSession(providerId, scopeListOrRequest, extensionId, extensionName, options = {}) {
         if (!this._authenticationService.isAuthenticationProviderRegistered(providerId)) {
             await ( new Promise((resolve, _) => {
                 const dispose = this._authenticationService.onDidRegisterAuthenticationProvider(e => {
@@ -394,54 +495,46 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         } catch (_e) {
             return;
         }
-        const providerRequests = this._signInRequestItems.get(providerId);
-        const signInRequestKey = isAuthenticationWwwAuthenticateRequest(scopeListOrRequest) ? `${scopeListOrRequest.wwwAuthenticate}:${scopeListOrRequest.fallbackScopes?.join(SCOPESLIST_SEPARATOR) ?? ""}` : `${scopeListOrRequest.join(SCOPESLIST_SEPARATOR)}`;
-        const extensionHasExistingRequest = providerRequests && providerRequests[signInRequestKey] && providerRequests[signInRequestKey].requestingExtensionIds.includes(extensionId);
-        if (extensionHasExistingRequest) {
+        const providerRequests = this._signInRequestItems.get(providerId) ?? {};
+        const signInRequestKey = getAuthenticationSessionRequestKey(scopeListOrRequest, options);
+        if (providerRequests[signInRequestKey]?.requestingExtensionIds.includes(extensionId)) {
             return;
         }
-        const commandId = `${providerId}:${extensionId}:signIn${( Object.keys(providerRequests || [])).length}`;
+        const request = providerRequests[signInRequestKey] ?? {
+            scopeListOrRequest,
+            options,
+            disposables: [],
+            requestingExtensionIds: []
+        };
+        const commandId = `${providerId}:${extensionId}:signIn:${generateUuid()}`;
         const menuItem = ( MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
             group: "2_signInRequests",
             command: {
                 id: commandId,
-                title: ( localize(21686, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
+                title: ( localize(24261, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({
             id: commandId,
-            handler: async accessor => {
-                const authenticationService = accessor.get(IAuthenticationService);
-                const session = await authenticationService.createSession(providerId, scopeListOrRequest);
+            handler: async () => {
+                const session = await this._authenticationService.createSession(providerId, scopeListOrRequest, options);
                 this._authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{
                     id: extensionId,
                     name: extensionName,
                     allowed: true
                 }]);
                 this._updateAccountAndSessionPreferences(providerId, extensionId, session);
+                this.completeSignInRequest(providerId, providerRequests, signInRequestKey, request);
+                void this.updateNewSessionRequests(providerId, [session]).catch(onUnexpectedError);
             }
         });
-        if (providerRequests) {
-            const existingRequest = providerRequests[signInRequestKey] || {
-                disposables: [],
-                requestingExtensionIds: []
-            };
-            providerRequests[signInRequestKey] = {
-                disposables: [...existingRequest.disposables, menuItem, signInCommand],
-                requestingExtensionIds: [...existingRequest.requestingExtensionIds, extensionId]
-            };
-            this._signInRequestItems.set(providerId, providerRequests);
-        } else {
-            this._signInRequestItems.set(providerId, {
-                [signInRequestKey]: {
-                    disposables: [menuItem, signInCommand],
-                    requestingExtensionIds: [extensionId]
-                }
-            });
-        }
+        request.disposables.push(menuItem, signInCommand);
+        request.requestingExtensionIds.push(extensionId);
+        providerRequests[signInRequestKey] = request;
+        this._signInRequestItems.set(providerId, providerRequests);
         this.updateBadgeCount();
     }
 };
-AuthenticationExtensionsService = ( __decorate([( __param(0, IActivityService)), ( __param(1, IStorageService)), ( __param(2, IDialogService)), ( __param(3, IQuickInputService)), ( __param(4, IProductService)), ( __param(5, IAuthenticationService)), ( __param(6, IAuthenticationUsageService)), ( __param(7, IAuthenticationAccessService))], AuthenticationExtensionsService));
+AuthenticationExtensionsService = ( __decorate([( __param(0, IActivityService)), ( __param(1, IStorageService)), ( __param(2, IDialogService)), ( __param(3, IQuickInputService)), ( __param(4, IProductService)), ( __param(5, IAuthenticationService)), ( __param(6, IAuthenticationUsageService)), ( __param(7, IAuthenticationAccessService)), ( __param(8, ILogService))], AuthenticationExtensionsService));
 
 export { AuthenticationExtensionsService };