@codingame/monaco-vscode-authentication-service-override 22.1.9 → 23.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-authentication-service-override",
-  "version": "22.1.9",
+  "version": "23.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - authentication service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "22.1.9",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "22.1.9"
+    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.0",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.0.0",
+    "@codingame/monaco-vscode-api": "23.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "23.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -16,9 +16,13 @@ class ManageAccountPreferencesForExtensionAction extends Action2 {
     constructor() {
         super({
             id: '_manageAccountPreferencesForExtension',
-            title: ( localize2(4345, "Manage Extension Account Preferences")),
-            category: ( localize2(4346, "Accounts")),
-            f1: true
+            title: ( localize2(4367, "Manage Extension Account Preferences...")),
+            category: ( localize2(4368, "Accounts")),
+            f1: true,
+            menu: [{
+                    id: MenuId.AccountsContext,
+                    order: 100,
+                }],
         });
     }
     run(accessor, extensionId, providerId) {
@@ -43,8 +47,8 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                 label: ext.displayName ?? ext.name,
                 id: ext.identifier.value
             }))), {
-                placeHolder: ( localize(4347, "Select an extension to manage account preferences for")),
-                title: ( localize(4348, "Manage Extension Account Preferences"))
+                placeHolder: ( localize(4369, "Select an extension to manage account preferences for")),
+                title: ( localize(4370, "Manage Extension Account Preferences"))
             });
             extensionId = result?.id;
         }
@@ -59,7 +63,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             const extensionQuery = this._authenticationQueryService.extension(extensionId);
             const providersWithAccess = await extensionQuery.getProvidersWithAccess();
             if (!providersWithAccess.length) {
-                await this._dialogService.info(( localize(4349, "This extension has not used any accounts yet.")));
+                await this._dialogService.info(( localize(4371, "This extension has not used any accounts yet.")));
                 return;
             }
             providerId = providersWithAccess[0];
@@ -69,10 +73,10 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                     id: providerId,
                 }))), {
                     placeHolder: ( localize(
-                        4350,
+                        4372,
                         "Select an authentication provider to manage account preferences for"
                     )),
-                    title: ( localize(4348, "Manage Extension Account Preferences"))
+                    title: ( localize(4370, "Manage Extension Account Preferences"))
                 });
                 if (!result) {
                     return;
@@ -93,7 +97,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                 items.push({
                     providerId,
                     scopes: lastUsedScopes,
-                    label: ( localize(4351, "Use a new account...")),
+                    label: ( localize(4373, "Use a new account...")),
                 });
             }
         }
@@ -112,12 +116,12 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             disposableStore.dispose();
         }));
         picker.placeholder = ( localize(
-            4352,
+            4374,
             "Manage '{0}' account preferences for {1}...",
             extensionLabel,
             providerLabel
         ));
-        picker.title = ( localize(4353, "'{0}' Account Preferences For This Workspace", extensionLabel));
+        picker.title = ( localize(4375, "'{0}' Account Preferences For This Workspace", extensionLabel));
         picker.sortByLabel = false;
         disposableStore.add(picker.onDidAccept(async () => {
             picker.hide();
@@ -131,7 +135,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                 label: a.label,
                 account: a,
                 providerId,
-                description: ( localize(4354, "Current account")),
+                description: ( localize(4376, "Current account")),
                 picked: true
             }
             : {
@@ -141,7 +145,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             }));
     }
     _handleNoAccounts(picker) {
-        picker.validationMessage = ( localize(4355, "No accounts are currently used by this extension."));
+        picker.validationMessage = ( localize(4377, "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(4356, "Manage MCP Server Account Preferences")),
-            category: ( localize2(4357, "Accounts")),
+            title: ( localize2(4378, "Manage MCP Server Account Preferences")),
+            category: ( localize2(4379, "Accounts")),
             f1: false
         });
     }
@@ -46,7 +46,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             const mcpServerQuery = this._authenticationQueryService.mcpServer(mcpServerId);
             const providersWithAccess = await mcpServerQuery.getProvidersWithAccess();
             if (!providersWithAccess.length) {
-                await this._dialogService.info(( localize(4358, "This MCP server has not used any accounts yet.")));
+                await this._dialogService.info(( localize(4380, "This MCP server has not used any accounts yet.")));
                 return;
             }
             providerId = providersWithAccess[0];
@@ -56,10 +56,10 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                     id: providerId,
                 }))), {
                     placeHolder: ( localize(
-                        4359,
+                        4381,
                         "Select an authentication provider to manage account preferences for"
                     )),
-                    title: ( localize(4360, "Manage MCP Server Account Preferences"))
+                    title: ( localize(4382, "Manage MCP Server Account Preferences"))
                 });
                 if (!result) {
                     return;
@@ -80,7 +80,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                 items.push({
                     providerId: providerId,
                     scopes: lastUsedScopes,
-                    label: ( localize(4361, "Use a new account...")),
+                    label: ( localize(4383, "Use a new account...")),
                 });
             }
         }
@@ -99,12 +99,12 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             disposableStore.dispose();
         }));
         picker.placeholder = ( localize(
-            4362,
+            4384,
             "Manage '{0}' account preferences for {1}...",
             mcpServerLabel,
             providerLabel
         ));
-        picker.title = ( localize(4363, "'{0}' Account Preferences For This Workspace", mcpServerLabel));
+        picker.title = ( localize(4385, "'{0}' Account Preferences For This Workspace", mcpServerLabel));
         picker.sortByLabel = false;
         disposableStore.add(picker.onDidAccept(async () => {
             picker.hide();
@@ -118,7 +118,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                 label: a.label,
                 account: a,
                 providerId,
-                description: ( localize(4364, "Current account")),
+                description: ( localize(4386, "Current account")),
                 picked: true
             }
             : {
@@ -128,7 +128,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             }));
     }
     _handleNoAccounts(picker) {
-        picker.validationMessage = ( localize(4365, "No accounts are currently used by this MCP server."));
+        picker.validationMessage = ( localize(4387, "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.d.ts

@@ -0,0 +1,6 @@
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class ManageAccountsAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}

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

@@ -0,0 +1,118 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service';
+import { getCurrentAuthenticationSessionInfo } from '@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common/vscode/vs/workbench/services/authentication/browser/authenticationService';
+import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
+
+class ManageAccountsAction extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.manageAccounts',
+            title: ( localize2(4388, "Manage Accounts")),
+            category: ( localize2(4389, "Accounts")),
+            f1: true
+        });
+    }
+    run(accessor) {
+        const instantiationService = accessor.get(IInstantiationService);
+        return instantiationService.createInstance(ManageAccountsActionImpl).run();
+    }
+}
+let ManageAccountsActionImpl = class ManageAccountsActionImpl {
+    constructor(quickInputService, authenticationService, commandService, secretStorageService, productService) {
+        this.quickInputService = quickInputService;
+        this.authenticationService = authenticationService;
+        this.commandService = commandService;
+        this.secretStorageService = secretStorageService;
+        this.productService = productService;
+    }
+    async run() {
+        const placeHolder = ( localize(4390, "Select an account to manage"));
+        const accounts = await this.listAccounts();
+        if (!accounts.length) {
+            await this.quickInputService.pick([{ label: ( localize(4391, "There are no active accounts.")) }], { placeHolder });
+            return;
+        }
+        const account = await this.quickInputService.pick(accounts, { placeHolder, matchOnDescription: true });
+        if (!account) {
+            return;
+        }
+        await this.showAccountActions(account);
+    }
+    async listAccounts() {
+        const activeSession = ( new Lazy(
+            () => getCurrentAuthenticationSessionInfo(this.secretStorageService, this.productService)
+        ));
+        const accounts = [];
+        for (const providerId of this.authenticationService.getProviderIds()) {
+            const provider = this.authenticationService.getProvider(providerId);
+            for (const { label, id } of await this.authenticationService.getAccounts(providerId)) {
+                accounts.push({
+                    label,
+                    description: provider.label,
+                    providerId,
+                    canUseMcp: !!provider.authorizationServers?.length,
+                    canSignOut: async () => this.canSignOut(provider, id, await activeSession.value)
+                });
+            }
+        }
+        return accounts;
+    }
+    async canSignOut(provider, accountId, session) {
+        if (session && !session.canSignOut && session.providerId === provider.id) {
+            const sessions = await this.authenticationService.getSessions(provider.id);
+            return !( sessions.some(o => o.id === session.id && o.account.id === accountId));
+        }
+        return true;
+    }
+    async showAccountActions(account) {
+        const { providerId, label: accountLabel, canUseMcp, canSignOut } = account;
+        const store = ( new DisposableStore());
+        const quickPick = store.add(this.quickInputService.createQuickPick());
+        quickPick.title = ( localize(4392, "Manage '{0}'", accountLabel));
+        quickPick.placeholder = ( localize(4393, "Select an action"));
+        const items = [{
+                label: ( localize(4394, "Manage Trusted Extensions")),
+                action: () => this.commandService.executeCommand('_manageTrustedExtensionsForAccount', { providerId, accountLabel })
+            }];
+        if (canUseMcp) {
+            items.push({
+                label: ( localize(4395, "Manage Trusted MCP Servers")),
+                action: () => this.commandService.executeCommand('_manageTrustedMCPServersForAccount', { providerId, accountLabel })
+            });
+        }
+        if (await canSignOut()) {
+            items.push({
+                label: ( localize(4396, "Sign Out")),
+                action: () => this.commandService.executeCommand('_signOutOfAccount', { providerId, accountLabel })
+            });
+        }
+        quickPick.items = items;
+        store.add(quickPick.onDidAccept(() => {
+            const selected = quickPick.selectedItems[0];
+            if (selected) {
+                quickPick.hide();
+                selected.action();
+            }
+        }));
+        store.add(quickPick.onDidHide(() => store.dispose()));
+        quickPick.show();
+    }
+};
+ManageAccountsActionImpl = ( __decorate([
+    ( __param(0, IQuickInputService)),
+    ( __param(1, IAuthenticationService)),
+    ( __param(2, ICommandService)),
+    ( __param(3, ISecretStorageService)),
+    ( __param(4, IProductService))
+], ManageAccountsActionImpl));
+
+export { ManageAccountsAction };

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

@@ -11,8 +11,8 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
     constructor() {
         super({
             id: RemoveDynamicAuthenticationProvidersAction.ID,
-            title: ( localize2(4366, 'Remove Dynamic Authentication Providers')),
-            category: ( localize2(4367, 'Authentication')),
+            title: ( localize2(4397, 'Remove Dynamic Authentication Providers')),
+            category: ( localize2(4398, 'Authentication')),
             f1: true
         });
     }
@@ -23,16 +23,16 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         const dialogService = accessor.get(IDialogService);
         const interactedProviders = dynamicAuthStorageService.getInteractedProviders();
         if (interactedProviders.length === 0) {
-            await dialogService.info(( localize(4368, 'No dynamic authentication providers')), ( localize(4369, 'No dynamic authentication providers have been used yet.')));
+            await dialogService.info(( localize(4399, 'No dynamic authentication providers')), ( localize(4400, 'No dynamic authentication providers have been used yet.')));
             return;
         }
         const items = ( interactedProviders.map(provider => ({
             label: provider.label,
-            description: ( localize(4370, 'Client ID: {0}', provider.clientId)),
+            description: ( localize(4401, 'Client ID: {0}', provider.clientId)),
             provider
         })));
         const selected = await quickInputService.pick(items, {
-            placeHolder: ( localize(4371, 'Select a dynamic authentication provider to remove')),
+            placeHolder: ( localize(4402, 'Select a dynamic authentication provider to remove')),
             canPickMany: true
         });
         if (!selected || selected.length === 0) {
@@ -41,12 +41,12 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         const providerNames = ( selected.map(item => item.provider.label)).join(', ');
         const message = selected.length === 1
             ? ( localize(
-            4372,
+            4403,
             'Are you sure you want to remove the dynamic authentication provider "{0}"?',
             providerNames
         ))
             : ( localize(
-            4373,
+            4404,
             '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(
-                4374,
+                4405,
                 '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(4375, 'Remove')),
+            primaryButton: ( localize(4406, 'Remove')),
             type: 'warning'
         });
         if (!result.confirmed) {

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

@@ -13,13 +13,14 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 
 class ManageTrustedExtensionsForAccountAction extends Action2 {
     constructor() {
         super({
             id: '_manageTrustedExtensionsForAccount',
-            title: ( localize2(4376, "Manage Trusted Extensions For Account")),
-            category: ( localize2(4377, "Accounts")),
+            title: ( localize2(4407, "Manage Trusted Extensions For Account")),
+            category: ( localize2(4408, "Accounts")),
             f1: true
         });
     }
@@ -29,13 +30,22 @@ class ManageTrustedExtensionsForAccountAction extends Action2 {
     }
 }
 let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsForAccountActionImpl {
-    constructor(_extensionService, _dialogService, _quickInputService, _authenticationService, _authenticationQueryService, _commandService) {
+    constructor(_extensionService, _dialogService, _quickInputService, _authenticationService, _authenticationQueryService, _commandService, _extensionsWorkbenchService) {
         this._extensionService = _extensionService;
         this._dialogService = _dialogService;
         this._quickInputService = _quickInputService;
         this._authenticationService = _authenticationService;
         this._authenticationQueryService = _authenticationQueryService;
         this._commandService = _commandService;
+        this._extensionsWorkbenchService = _extensionsWorkbenchService;
+        this._viewDetailsButton = {
+            tooltip: ( localize(4409, "View extension details")),
+            iconClass: ThemeIcon.asClassName(Codicon.info),
+        };
+        this._managePreferencesButton = {
+            tooltip: ( localize(4410, "Manage account preferences for this extension")),
+            iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
+        };
     }
     async run(options) {
         const accountQuery = await this._resolveAccountQuery(options?.providerId, options?.accountLabel);
@@ -57,7 +67,7 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         }
         const accounts = await this._getAllAvailableAccounts();
         const pick = await this._quickInputService.pick(accounts, {
-            placeHolder: ( localize(4378, "Pick an account to manage trusted extensions for")),
+            placeHolder: ( localize(4411, "Pick an account to manage trusted extensions for")),
             matchOnDescription: true,
         });
         return pick ? this._authenticationQueryService.provider(pick.providerId).account(pick.label) : undefined;
@@ -101,28 +111,29 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
             };
         }));
         if (!filteredExtensions.length) {
-            this._dialogService.info(( localize(4379, "This account has not been used by any extensions.")));
+            this._dialogService.info(( localize(4412, "This account has not been used by any extensions.")));
             return [];
         }
         const trustedExtensions = filteredExtensions.filter(e => e.trusted);
         const otherExtensions = filteredExtensions.filter(e => !e.trusted);
         const sortByLastUsed = (a, b) => (b.lastUsed || 0) - (a.lastUsed || 0);
+        const _toQuickPickItem = this._toQuickPickItem.bind(this);
         return [
-            ...( otherExtensions.sort(sortByLastUsed).map(this._toQuickPickItem)),
-            { type: 'separator', label: ( localize(4380, "Trusted by Microsoft")) },
-            ...( trustedExtensions.sort(sortByLastUsed).map(this._toQuickPickItem))
+            ...( otherExtensions.sort(sortByLastUsed).map(_toQuickPickItem)),
+            { type: 'separator', label: ( localize(4413, "Trusted by Microsoft")) },
+            ...( trustedExtensions.sort(sortByLastUsed).map(_toQuickPickItem))
         ];
     }
     _toQuickPickItem(extension) {
         const lastUsed = extension.lastUsed;
         const description = lastUsed
-            ? ( localize(4381, "Last used this account {0}", fromNow(lastUsed, true)))
-            : ( localize(4382, "Has not used this account"));
+            ? ( localize(4414, "Last used this account {0}", fromNow(lastUsed, true)))
+            : ( localize(4415, "Has not used this account"));
         let tooltip;
         let disabled;
         if (extension.trusted) {
             tooltip = ( localize(
-                4383,
+                4416,
                 "This extension is trusted by Microsoft and\nalways has access to this account"
             ));
             disabled = true;
@@ -133,10 +144,7 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
             description,
             tooltip,
             disabled,
-            buttons: [{
-                    tooltip: ( localize(4384, "Manage account preferences for this extension")),
-                    iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                }],
+            buttons: [this._viewDetailsButton, this._managePreferencesButton],
             picked: extension.allowed === undefined || extension.allowed
         };
     }
@@ -145,9 +153,9 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         const quickPick = disposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         quickPick.canSelectMany = true;
         quickPick.customButton = true;
-        quickPick.customLabel = ( localize(4385, 'Cancel'));
-        quickPick.title = ( localize(4386, "Manage Trusted Extensions"));
-        quickPick.placeholder = ( localize(4387, "Choose which extensions can access this account"));
+        quickPick.customLabel = ( localize(4417, 'Cancel'));
+        quickPick.title = ( localize(4418, "Manage Trusted Extensions"));
+        quickPick.placeholder = ( localize(4419, "Choose which extensions can access this account"));
         disposableStore.add(quickPick.onDidAccept(() => {
             const updatedAllowedList = ( quickPick.items
                 .filter((item) => item.type !== 'separator')
@@ -161,7 +169,14 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         }));
         disposableStore.add(quickPick.onDidHide(() => disposableStore.dispose()));
         disposableStore.add(quickPick.onDidCustom(() => quickPick.hide()));
-        disposableStore.add(quickPick.onDidTriggerItemButton(e => this._commandService.executeCommand('_manageAccountPreferencesForExtension', e.item.extension.id, accountQuery.providerId)));
+        disposableStore.add(quickPick.onDidTriggerItemButton(e => {
+            if (e.button === this._managePreferencesButton) {
+                this._commandService.executeCommand('_manageAccountPreferencesForExtension', e.item.extension.id, accountQuery.providerId);
+            }
+            else if (e.button === this._viewDetailsButton) {
+                this._extensionsWorkbenchService.open(e.item.extension.id);
+            }
+        }));
         return quickPick;
     }
 };
@@ -171,7 +186,8 @@ ManageTrustedExtensionsForAccountActionImpl = ( __decorate([
     ( __param(2, IQuickInputService)),
     ( __param(3, IAuthenticationService)),
     ( __param(4, IAuthenticationQueryService)),
-    ( __param(5, ICommandService))
+    ( __param(5, ICommandService)),
+    ( __param(6, IExtensionsWorkbenchService))
 ], ManageTrustedExtensionsForAccountActionImpl));
 
 export { ManageTrustedExtensionsForAccountAction };

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

@@ -12,15 +12,17 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 
 class ManageTrustedMcpServersForAccountAction extends Action2 {
     constructor() {
         super({
             id: '_manageTrustedMCPServersForAccount',
-            title: ( localize2(4388, "Manage Trusted MCP Servers For Account")),
-            category: ( localize2(4389, "Accounts")),
-            f1: true
+            title: ( localize2(4420, "Manage Trusted MCP Servers For Account")),
+            category: ( localize2(4421, "Accounts")),
+            f1: true,
+            precondition: ( ChatContextKeys.Setup.hidden.negate())
         });
     }
     run(accessor, options) {
@@ -57,7 +59,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         }
         const accounts = await this._getAllAvailableAccounts();
         const pick = await this._quickInputService.pick(accounts, {
-            placeHolder: ( localize(4390, "Pick an account to manage trusted MCP servers for")),
+            placeHolder: ( localize(4422, "Pick an account to manage trusted MCP servers for")),
             matchOnDescription: true,
         });
         return pick ? this._authenticationQueryService.provider(pick.providerId).account(pick.label) : undefined;
@@ -95,7 +97,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
             };
         }));
         if (!filteredMcpServers.length) {
-            this._dialogService.info(( localize(4391, "This account has not been used by any MCP servers.")));
+            this._dialogService.info(( localize(4423, "This account has not been used by any MCP servers.")));
             return [];
         }
         const trustedServers = filteredMcpServers.filter(s => s.trusted);
@@ -103,20 +105,20 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         const sortByLastUsed = (a, b) => (b.lastUsed || 0) - (a.lastUsed || 0);
         return [
             ...( otherServers.sort(sortByLastUsed).map(this._toQuickPickItem)),
-            { type: 'separator', label: ( localize(4392, "Trusted by Microsoft")) },
+            { type: 'separator', label: ( localize(4424, "Trusted by Microsoft")) },
             ...( trustedServers.sort(sortByLastUsed).map(this._toQuickPickItem))
         ];
     }
     _toQuickPickItem(mcpServer) {
         const lastUsed = mcpServer.lastUsed;
         const description = lastUsed
-            ? ( localize(4393, "Last used this account {0}", fromNow(lastUsed, true)))
-            : ( localize(4394, "Has not used this account"));
+            ? ( localize(4425, "Last used this account {0}", fromNow(lastUsed, true)))
+            : ( localize(4426, "Has not used this account"));
         let tooltip;
         let disabled;
         if (mcpServer.trusted) {
             tooltip = ( localize(
-                4395,
+                4427,
                 "This MCP server is trusted by Microsoft and\nalways has access to this account"
             ));
             disabled = true;
@@ -128,7 +130,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
             tooltip,
             disabled,
             buttons: [{
-                    tooltip: ( localize(4396, "Manage account preferences for this MCP server")),
+                    tooltip: ( localize(4428, "Manage account preferences for this MCP server")),
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
                 }],
             picked: mcpServer.allowed === undefined || mcpServer.allowed
@@ -139,9 +141,9 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         const quickPick = disposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         quickPick.canSelectMany = true;
         quickPick.customButton = true;
-        quickPick.customLabel = ( localize(4397, 'Cancel'));
-        quickPick.title = ( localize(4398, "Manage Trusted MCP Servers"));
-        quickPick.placeholder = ( localize(4399, "Choose which MCP servers can access this account"));
+        quickPick.customLabel = ( localize(4429, 'Cancel'));
+        quickPick.title = ( localize(4430, "Manage Trusted MCP Servers"));
+        quickPick.placeholder = ( localize(4431, "Choose which MCP servers can access this account"));
         disposableStore.add(quickPick.onDidAccept(() => {
             quickPick.hide();
             const allServers = ( quickPick.items

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(4400, "Sign out of account")),
+            title: ( localize(4432, "Sign out of account")),
             f1: false
         });
     }
@@ -32,13 +32,13 @@ class SignOutOfAccountAction extends Action2 {
             type: Severity.Info,
             message: accountUsages.length
                 ? ( localize(
-                4401,
+                4433,
                 "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(4402, "Sign out of '{0}'?", accountLabel)),
-            primaryButton: ( localize(4403, "&&Sign Out"))
+                : ( localize(4434, "Sign out of '{0}'?", accountLabel)),
+            primaryButton: ( localize(4435, "&&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

@@ -16,12 +16,7 @@ import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode
 import { ManageAccountPreferencesForMcpServerAction } from './actions/manageAccountPreferencesForMcpServerAction.js';
 import { ManageTrustedMcpServersForAccountAction } from './actions/manageTrustedMcpServersForAccountAction.js';
 import { RemoveDynamicAuthenticationProvidersAction } from './actions/manageDynamicAuthenticationProvidersAction.js';
-import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
-import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
-import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { ManageAccountsAction } from './actions/manageAccountsAction.js';
 
 const codeExchangeProxyCommand = CommandsRegistry.registerCommand('workbench.getCodeExchangeProxyEndpoints', function (accessor, _) {
     const environmentService = accessor.get(IBrowserWorkbenchEnvironmentService);
@@ -41,9 +36,9 @@ class AuthenticationDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(4404, "Label")),
-            ( localize(4405, "ID")),
-            ( localize(4406, "MCP Authorization Servers"))
+            ( localize(4436, "Label")),
+            ( localize(4437, "ID")),
+            ( localize(4438, "MCP Authorization Servers"))
         ];
         const rows = ( authentication
             .sort((a, b) => a.label.localeCompare(b.label))
@@ -65,7 +60,7 @@ class AuthenticationDataRenderer extends Disposable {
 }
 const extensionFeature = ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'authentication',
-    label: ( localize(4407, "Authentication")),
+    label: ( localize(4439, "Authentication")),
     access: {
         canToggle: false
     },
@@ -80,6 +75,7 @@ class AuthenticationContribution extends Disposable {
         this._registerActions();
     }
     _registerActions() {
+        this._register(registerAction2(ManageAccountsAction));
         this._register(registerAction2(SignOutOfAccountAction));
         this._register(registerAction2(ManageTrustedExtensionsForAccountAction));
         this._register(registerAction2(ManageAccountPreferencesForExtensionAction));
@@ -101,40 +97,5 @@ let AuthenticationUsageContribution = class AuthenticationUsageContribution {
 AuthenticationUsageContribution = ( __decorate([
     ( __param(0, IAuthenticationUsageService))
 ], AuthenticationUsageContribution));
-let AuthenticationMcpContribution = class AuthenticationMcpContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.authenticationMcp'; }
-    constructor(_mcpRegistry, _authenticationQueryService, _authenticationService) {
-        super();
-        this._mcpRegistry = _mcpRegistry;
-        this._authenticationQueryService = _authenticationQueryService;
-        this._authenticationService = _authenticationService;
-        this._cleanupRemovedMcpServers();
-        this._register(autorun(reader => {
-            this._mcpRegistry.collections.read(reader);
-            queueMicrotask(() => this._cleanupRemovedMcpServers());
-        }));
-        this._register(Event.any(this._authenticationService.onDidChangeDeclaredProviders, this._authenticationService.onDidRegisterAuthenticationProvider)(() => this._cleanupRemovedMcpServers()));
-    }
-    _cleanupRemovedMcpServers() {
-        const currentServerIds = ( new Set(( this._mcpRegistry.collections.get().flatMap(c => c.serverDefinitions.get()).map(s => s.id))));
-        const providerIds = this._authenticationQueryService.getProviderIds();
-        for (const providerId of providerIds) {
-            this._authenticationQueryService.provider(providerId).forEachAccount(account => {
-                account.mcpServers().forEach(server => {
-                    if (!( currentServerIds.has(server.mcpServerId))) {
-                        server.removeUsage();
-                        server.setAccessAllowed(false);
-                    }
-                });
-            });
-        }
-    }
-};
-AuthenticationMcpContribution = ( __decorate([
-    ( __param(0, IMcpRegistry)),
-    ( __param(1, IAuthenticationQueryService)),
-    ( __param(2, IAuthenticationService))
-], AuthenticationMcpContribution));
 registerWorkbenchContribution2(AuthenticationContribution.ID, AuthenticationContribution, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(AuthenticationUsageContribution.ID, AuthenticationUsageContribution, WorkbenchPhase.Eventually);
-registerWorkbenchContribution2(AuthenticationMcpContribution.ID, AuthenticationMcpContribution, WorkbenchPhase.Eventually);

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

@@ -11,7 +11,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/noti
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { NumberBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/activity/common/activity';
 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';
@@ -113,7 +113,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(13199, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(13496, "Sign in requested"))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
         }
     }
@@ -180,7 +180,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                13200,
+                13497,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
@@ -188,11 +188,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             )),
             buttons: [
                 {
-                    label: ( localize(13201, "&&Allow")),
+                    label: ( localize(13498, "&&Allow")),
                     run: () => SessionPromptChoice.Allow
                 },
                 {
-                    label: ( localize(13202, "&&Deny")),
+                    label: ( localize(13499, "&&Deny")),
                     run: () => SessionPromptChoice.Deny
                 }
             ],
@@ -228,16 +228,16 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 items.push({ label: account.label, account });
             }
         });
-        items.push({ label: ( localize(13203, "Sign in to another account")) });
+        items.push({ label: ( localize(13500, "Sign in to another account")) });
         quickPick.items = items;
         quickPick.title = ( localize(
-            13204,
+            13501,
             "The extension '{0}' wants to access a {1} account",
             extensionName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            13205,
+            13502,
             "Select an account for '{0}' to use or Esc to cancel",
             extensionName
         ));
@@ -309,7 +309,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '3_accessRequests',
             command: {
                 id: `${providerId}${extensionId}Access`,
-                title: ( localize(13206, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
+                title: ( localize(13503, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -355,7 +355,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '2_signInRequests',
             command: {
                 id: commandId,
-                title: ( localize(13207, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
+                title: ( localize(13504, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({