@codingame/monaco-vscode-extensions-service-override 3.2.3 → 4.0.0

package/extensions.js

@@ -37,88 +37,7 @@ import { changeUrlDomain } from './tools/url.js';
 import { CustomSchemas } from '@codingame/monaco-vscode-files-service-override';
 import { registerAssets } from 'vscode/assets';
 import { getForcedExtensionHostKind } from 'vscode/extensions';
-import 'vscode/vscode/vs/workbench/api/common/jsonValidationExtensionPoint';
-import 'vscode/vscode/vs/workbench/services/themes/common/colorExtensionPoint';
-import 'vscode/vscode/vs/workbench/services/themes/common/iconExtensionPoint';
-import 'vscode/vscode/vs/workbench/services/themes/common/tokenClassificationExtensionPoint';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint';
-import 'vscode/vscode/vs/workbench/api/browser/statusBarExtensionPoint';
-import './vscode/src/vs/workbench/api/browser/mainThreadLocalization.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadChatProvider.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadClipboard.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadCommands.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadConsole.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDebugService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDecorations.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDiagnostics.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDialogs.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDocuments.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js';
-import 'vscode/vscode/vs/editor/common/config/editorOptions';
-import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
-import 'vscode/vscode/vs/editor/contrib/editorState/browser/keybindingCancellation';
-import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
-import './vscode/src/vs/workbench/api/browser/mainThreadEditors.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadErrors.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadLanguages.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadLogService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadMessageService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadOutputService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadProgress.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadQuickDiff.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadQuickOpen.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadSpeech.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadSCM.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadSearch.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadStatusBar.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadStorage.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTelemetry.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTheming.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadDownloadService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadUrls.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadWindow.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadWebviewManager.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadComments.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadNotebook.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadNotebookRenderers.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadInteractive.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadInlineChat.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadChat.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTask.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadLabelService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTimeline.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadTesting.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadSecretState.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadShare.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadProfilContentHandlers.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadIssueReporter.js';
+import './vscode/src/vs/workbench/api/browser/extensionHost.contribution.js';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 let EsmWebWorkerExtensionHost = class EsmWebWorkerExtensionHost extends WebWorkerExtensionHost {

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "3.2.3",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,13 +18,13 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.3",
-    "@codingame/monaco-vscode-files-service-override": "3.2.3",
-    "@codingame/monaco-vscode-quickaccess-service-override": "3.2.3",
-    "@codingame/monaco-vscode-extensions-service-override": "3.2.3",
-    "@codingame/monaco-vscode-environment-service-override": "3.2.3",
-    "@codingame/monaco-vscode-layout-service-override": "3.2.3",
-    "@codingame/monaco-vscode-host-service-override": "3.2.3",
-    "@codingame/monaco-vscode-base-service-override": "3.2.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0",
+    "@codingame/monaco-vscode-files-service-override": "4.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "4.0.0",
+    "@codingame/monaco-vscode-extensions-service-override": "4.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "4.0.0",
+    "@codingame/monaco-vscode-layout-service-override": "4.0.0",
+    "@codingame/monaco-vscode-host-service-override": "4.0.0",
+    "@codingame/monaco-vscode-base-service-override": "4.0.0"
   }
 }

package/vscode/src/vs/base/common/console.js

@@ -1,3 +1,6 @@
+import 'vscode/vscode/vs/base/common/path';
+import 'vscode/vscode/vs/base/common/platform';
+
 function parse(entry) {
     const args = [];
     let stack;

package/vscode/src/vs/workbench/api/browser/extensionHost.contribution.js

@@ -0,0 +1,104 @@
+import 'vscode/vscode/vs/workbench/common/contributions';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { JSONValidationExtensionPoint } from 'vscode/vscode/vs/workbench/api/common/jsonValidationExtensionPoint';
+import { ColorExtensionPoint } from 'vscode/vscode/vs/workbench/services/themes/common/colorExtensionPoint';
+import { IconExtensionPoint } from 'vscode/vscode/vs/workbench/services/themes/common/iconExtensionPoint';
+import { TokenClassificationExtensionPoints } from 'vscode/vscode/vs/workbench/services/themes/common/tokenClassificationExtensionPoint';
+import { LanguageConfigurationFileHandler } from 'vscode/vscode/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint';
+import { StatusBarItemsExtensionPoint } from 'vscode/vscode/vs/workbench/api/browser/statusBarExtensionPoint';
+import './mainThreadLocalization.js';
+import './mainThreadBulkEdits.js';
+import './mainThreadLanguageModels.js';
+import './mainThreadChatAgents2.js';
+import './mainThreadChatVariables.js';
+import './mainThreadCodeInsets.js';
+import './mainThreadCLICommands.js';
+import './mainThreadClipboard.js';
+import './mainThreadCommands.js';
+import './mainThreadConfiguration.js';
+import './mainThreadConsole.js';
+import './mainThreadDebugService.js';
+import './mainThreadDecorations.js';
+import './mainThreadDiagnostics.js';
+import './mainThreadDialogs.js';
+import './mainThreadDocumentContentProviders.js';
+import './mainThreadDocuments.js';
+import './mainThreadDocumentsAndEditors.js';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/editor/common/config/editorOptions';
+import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
+import 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/strings';
+import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/editor/contrib/editorState/browser/keybindingCancellation';
+import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
+import './mainThreadEditors.js';
+import './mainThreadEditorTabs.js';
+import './mainThreadErrors.js';
+import './mainThreadExtensionService.js';
+import './mainThreadFileSystem.js';
+import './mainThreadFileSystemEventService.js';
+import './mainThreadLanguageFeatures.js';
+import './mainThreadLanguages.js';
+import './mainThreadLogService.js';
+import './mainThreadMessageService.js';
+import './mainThreadManagedSockets.js';
+import './mainThreadOutputService.js';
+import './mainThreadProgress.js';
+import './mainThreadQuickDiff.js';
+import './mainThreadQuickOpen.js';
+import './mainThreadRemoteConnectionData.js';
+import './mainThreadSaveParticipant.js';
+import './mainThreadSpeech.js';
+import './mainThreadEditSessionIdentityParticipant.js';
+import './mainThreadSCM.js';
+import './mainThreadSearch.js';
+import './mainThreadStatusBar.js';
+import './mainThreadStorage.js';
+import './mainThreadTelemetry.js';
+import './mainThreadTerminalService.js';
+import './mainThreadTerminalShellIntegration.js';
+import './mainThreadTheming.js';
+import './mainThreadTreeViews.js';
+import './mainThreadDownloadService.js';
+import './mainThreadUrls.js';
+import './mainThreadUriOpeners.js';
+import './mainThreadWindow.js';
+import './mainThreadWebviewManager.js';
+import './mainThreadWorkspace.js';
+import './mainThreadComments.js';
+import './mainThreadNotebook.js';
+import './mainThreadNotebookKernels.js';
+import './mainThreadNotebookDocumentsAndEditors.js';
+import './mainThreadNotebookRenderers.js';
+import './mainThreadNotebookSaveParticipant.js';
+import './mainThreadInteractive.js';
+import './mainThreadInlineChat.js';
+import './mainThreadChat.js';
+import './mainThreadTask.js';
+import './mainThreadLabelService.js';
+import './mainThreadTunnelService.js';
+import './mainThreadAuthentication.js';
+import './mainThreadTimeline.js';
+import './mainThreadTesting.js';
+import './mainThreadSecretState.js';
+import './mainThreadShare.js';
+import './mainThreadProfileContentHandlers.js';
+import './mainThreadAiRelatedInformation.js';
+import './mainThreadAiEmbeddingVector.js';
+import './mainThreadIssueReporter.js';
+
+(class ExtensionPoints {
+    static { this.ID = 'workbench.contrib.extensionPoints'; }
+    constructor(instantiationService) {
+        this.instantiationService = instantiationService;
+        this.instantiationService.createInstance(JSONValidationExtensionPoint);
+        this.instantiationService.createInstance(ColorExtensionPoint);
+        this.instantiationService.createInstance(IconExtensionPoint);
+        this.instantiationService.createInstance(TokenClassificationExtensionPoints);
+        this.instantiationService.createInstance(LanguageConfigurationFileHandler);
+        this.instantiationService.createInstance(StatusBarItemsExtensionPoint);
+    }
+});

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

@@ -2,16 +2,19 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { getAuthenticationProviderActivationEvent, addAccountUsage } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
-import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
+import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService';
+import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService';
+import { getAuthenticationProviderActivationEvent } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 class MainThreadAuthenticationProvider extends Disposable {
@@ -40,14 +43,17 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
-    constructor(extHostContext, authenticationService, dialogService, storageService, notificationService, extensionService, telemetryService) {
+    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, extensionService, telemetryService, openerService) {
         super();
         this.authenticationService = authenticationService;
+        this.authenticationExtensionsService = authenticationExtensionsService;
+        this.authenticationAccessService = authenticationAccessService;
+        this.authenticationUsageService = authenticationUsageService;
         this.dialogService = dialogService;
-        this.storageService = storageService;
         this.notificationService = notificationService;
         this.extensionService = extensionService;
         this.telemetryService = telemetryService;
+        this.openerService = openerService;
         this._registrations = this._register(( new DisposableMap()));
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostAuthentication));
         this._register(this.authenticationService.onDidChangeSessions(e => {
@@ -85,7 +91,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     $removeSession(providerId, sessionId) {
         return this.authenticationService.removeSession(providerId, sessionId);
     }
-    async loginPrompt(providerName, extensionName, recreatingSession, detail) {
+    async loginPrompt(providerName, extensionName, recreatingSession, options) {
         const message = recreatingSession
             ? ( localizeWithPath(
             'vs/workbench/api/browser/mainThreadAuthentication',
@@ -101,21 +107,44 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             extensionName,
             providerName
         ));
-        const { confirmed } = await this.dialogService.confirm({
-            type: Severity.Info,
+        const buttons = [
+            {
+                label: ( localizeWithPath(
+                    'vs/workbench/api/browser/mainThreadAuthentication',
+                    { key: 'allow', comment: ['&& denotes a mnemonic'] },
+                    "&&Allow"
+                )),
+                run() {
+                    return true;
+                },
+            }
+        ];
+        if (options?.learnMore) {
+            buttons.push({
+                label: ( localizeWithPath(
+                    'vs/workbench/api/browser/mainThreadAuthentication',
+                    'learnMore',
+                    "Learn more"
+                )),
+                run: async () => {
+                    const result = this.loginPrompt(providerName, extensionName, recreatingSession, options);
+                    await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
+                    return await result;
+                }
+            });
+        }
+        const { result } = await this.dialogService.prompt({
+            type: Severity$1.Info,
             message,
-            detail,
-            primaryButton: ( localizeWithPath(
-                'vs/workbench/api/browser/mainThreadAuthentication',
-                { key: 'allow', comment: ['&& denotes a mnemonic'] },
-                "&&Allow"
-            ))
+            buttons,
+            detail: options?.detail,
+            cancelButton: true,
         });
-        return confirmed;
+        return result ?? false;
     }
     async doGetSession(providerId, scopes, extensionId, extensionName, options) {
         const sessions = await this.authenticationService.getSessions(providerId, scopes, true);
-        const supportsMultipleAccounts = this.authenticationService.supportsMultipleAccounts(providerId);
+        const provider = this.authenticationService.getProvider(providerId);
         if (options.forceNewSession && options.createIfNone) {
             throw new Error('Invalid combination of options. Please remove one of the following: forceNewSession, createIfNone');
         }
@@ -126,36 +155,38 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             throw new Error('Invalid combination of options. Please remove one of the following: createIfNone, silent');
         }
         if (!options.forceNewSession && sessions.length) {
-            if (supportsMultipleAccounts) {
+            if (provider.supportsMultipleAccounts) {
                 if (options.clearSessionPreference) {
-                    this.authenticationService.removeSessionPreference(providerId, extensionId, scopes);
+                    this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
                 }
                 else {
-                    const existingSessionPreference = this.authenticationService.getSessionPreference(providerId, extensionId, scopes);
+                    const existingSessionPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
                     if (existingSessionPreference) {
                         const matchingSession = sessions.find(session => session.id === existingSessionPreference);
-                        if (matchingSession && this.authenticationService.isAccessAllowed(providerId, matchingSession.account.label, extensionId)) {
+                        if (matchingSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingSession.account.label, extensionId)) {
                             return matchingSession;
                         }
                     }
                 }
             }
-            else if (this.authenticationService.isAccessAllowed(providerId, sessions[0].account.label, extensionId)) {
+            else if (this.authenticationAccessService.isAccessAllowed(providerId, sessions[0].account.label, extensionId)) {
                 return sessions[0];
             }
         }
         if (options.createIfNone || options.forceNewSession) {
-            const providerName = this.authenticationService.getLabel(providerId);
-            const detail = (typeof options.forceNewSession === 'object') ? options.forceNewSession.detail : undefined;
+            let uiOptions;
+            if (typeof options.forceNewSession === 'object') {
+                uiOptions = options.forceNewSession;
+            }
             const recreatingSession = !!(options.forceNewSession && sessions.length);
-            const isAllowed = await this.loginPrompt(providerName, extensionName, recreatingSession, detail);
+            const isAllowed = await this.loginPrompt(provider.label, extensionName, recreatingSession, uiOptions);
             if (!isAllowed) {
                 throw new Error('User did not consent to login.');
             }
             let session;
             if (sessions?.length && !options.forceNewSession) {
-                session = supportsMultipleAccounts
-                    ? await this.authenticationService.selectSession(providerId, extensionId, extensionName, scopes, sessions)
+                session = provider.supportsMultipleAccounts
+                    ? await this.authenticationExtensionsService.selectSession(providerId, extensionId, extensionName, scopes, sessions)
                     : sessions[0];
             }
             else {
@@ -164,30 +195,23 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                     sessionToRecreate = options.forceNewSession.sessionToRecreate;
                 }
                 else {
-                    const sessionIdToRecreate = this.authenticationService.getSessionPreference(providerId, extensionId, scopes);
+                    const sessionIdToRecreate = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
                     sessionToRecreate = sessionIdToRecreate ? sessions.find(session => session.id === sessionIdToRecreate) : undefined;
                 }
                 session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, sessionToRecreate });
             }
-            this.authenticationService.updateAllowedExtension(providerId, session.account.label, extensionId, extensionName, true);
-            this.authenticationService.updateSessionPreference(providerId, extensionId, session);
+            this.authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
+            this.authenticationExtensionsService.updateSessionPreference(providerId, extensionId, session);
             return session;
         }
-        const validSession = sessions.find(session => this.authenticationService.isAccessAllowed(providerId, session.account.label, extensionId));
+        const validSession = sessions.find(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
         if (validSession) {
-            if (!this.authenticationService.getSessionPreference(providerId, extensionId, scopes)) {
-                if (this.storageService.get(`${extensionName}-${providerId}`, -1 )) {
-                    this.storageService.remove(`${extensionName}-${providerId}`, -1 );
-                }
-                this.authenticationService.updateAllowedExtension(providerId, validSession.account.label, extensionId, extensionName, true);
-                this.authenticationService.updateSessionPreference(providerId, extensionId, validSession);
-            }
             return validSession;
         }
         if (!options.silent) {
             sessions.length
-                ? this.authenticationService.requestSessionAccess(providerId, extensionId, extensionName, scopes, sessions)
-                : await this.authenticationService.requestNewSession(providerId, scopes, extensionId, extensionName);
+                ? this.authenticationExtensionsService.requestSessionAccess(providerId, extensionId, extensionName, scopes, sessions)
+                : await this.authenticationExtensionsService.requestNewSession(providerId, scopes, extensionId, extensionName);
         }
         return undefined;
     }
@@ -195,17 +219,17 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const session = await this.doGetSession(providerId, scopes, extensionId, extensionName, options);
         if (session) {
             this.sendProviderUsageTelemetry(extensionId, providerId);
-            addAccountUsage(this.storageService, providerId, session.account.label, extensionId, extensionName);
+            this.authenticationUsageService.addAccountUsage(providerId, session.account.label, extensionId, extensionName);
         }
         return session;
     }
     async $getSessions(providerId, scopes, extensionId, extensionName) {
         const sessions = await this.authenticationService.getSessions(providerId, [...scopes], true);
-        const accessibleSessions = sessions.filter(s => this.authenticationService.isAccessAllowed(providerId, s.account.label, extensionId));
+        const accessibleSessions = sessions.filter(s => this.authenticationAccessService.isAccessAllowed(providerId, s.account.label, extensionId));
         if (accessibleSessions.length) {
             this.sendProviderUsageTelemetry(extensionId, providerId);
             for (const session of accessibleSessions) {
-                addAccountUsage(this.storageService, providerId, session.account.label, extensionId, extensionName);
+                this.authenticationUsageService.addAccountUsage(providerId, session.account.label, extensionId, extensionName);
             }
         }
         return accessibleSessions;
@@ -217,11 +241,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
 MainThreadAuthentication = __decorate([
     extHostNamedCustomer(MainContext.MainThreadAuthentication),
     ( __param(1, IAuthenticationService)),
-    ( __param(2, IDialogService)),
-    ( __param(3, IStorageService)),
-    ( __param(4, INotificationService)),
-    ( __param(5, IExtensionService)),
-    ( __param(6, ITelemetryService))
+    ( __param(2, IAuthenticationExtensionsService)),
+    ( __param(3, IAuthenticationAccessService)),
+    ( __param(4, IAuthenticationUsageService)),
+    ( __param(5, IDialogService)),
+    ( __param(6, INotificationService)),
+    ( __param(7, IExtensionService)),
+    ( __param(8, ITelemetryService)),
+    ( __param(9, IOpenerService))
 ], MainThreadAuthentication);
 
 export { MainThreadAuthentication, MainThreadAuthenticationProvider };

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

@@ -39,17 +39,10 @@ let MainThreadChat = class MainThreadChat extends Disposable {
                 if (!session) {
                     return undefined;
                 }
-                const responderAvatarIconUri = session.responderAvatarIconUri &&
-                    URI.revive(session.responderAvatarIconUri);
                 const emitter = ( new Emitter());
                 this._stateEmitters.set(session.id, emitter);
                 return {
                     id: session.id,
-                    requesterUsername: session.requesterUsername,
-                    requesterAvatarIconUri: URI.revive(session.requesterAvatarIconUri),
-                    responderUsername: session.responderUsername,
-                    responderAvatarIconUri,
-                    inputPlaceholder: session.inputPlaceholder,
                     dispose: () => {
                         emitter.dispose();
                         this._stateEmitters.delete(session.id);
@@ -63,12 +56,6 @@ let MainThreadChat = class MainThreadChat extends Disposable {
     async $acceptChatState(sessionId, state) {
         this._stateEmitters.get(sessionId)?.fire(state);
     }
-    async $sendRequestToProvider(providerId, message) {
-        const widget = await this._chatWidgetService.revealViewForProvider(providerId);
-        if (widget && widget.viewModel) {
-            this._chatService.sendRequestToProvider(widget.viewModel.sessionId, message);
-        }
-    }
     async $unregisterChatProvider(handle) {
         this._providerRegistrations.deleteAndDispose(handle);
     }

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

@@ -10,7 +10,7 @@ import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/comm
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 import { AddDynamicVariableAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { IChatAgentService, ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
@@ -34,7 +34,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._register(this._chatService.onDidPerformUserAction(e => {
             if (typeof e.agentId === 'string') {
                 for (const [handle, agent] of this._agents) {
-                    if (agent.name === e.agentId) {
+                    if (agent.id === e.agentId) {
                         if (e.action.kind === 'vote') {
                             this._proxy.$acceptFeedback(handle, e.result ?? {}, e.action.direction);
                         }
@@ -50,12 +50,15 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     $unregisterAgent(handle) {
         this._agents.deleteAndDispose(handle);
     }
-    $registerAgent(handle, extension, name, metadata) {
-        const lastSlashCommands = ( new WeakMap());
-        const d = this._chatAgentService.registerAgent({
-            id: name,
-            extensionId: extension,
-            metadata: revive(metadata),
+    $registerAgent(handle, extension, id, metadata, dynamicProps) {
+        const staticAgentRegistration = this._chatAgentService.getAgent(id);
+        if (!staticAgentRegistration && !dynamicProps) {
+            if (this._chatAgentService.getAgentsByName(id).length) {
+                throw new Error(`chatParticipant must be declared with an ID in package.json. The "id" property may be missing! "${id}"`);
+            }
+            throw new Error(`chatParticipant must be declared in package.json: ${id}`);
+        }
+        const impl = {
             invoke: async (request, progress, history, token) => {
                 this._pendingProgress.set(request.requestId, progress);
                 try {
@@ -65,24 +68,11 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                     this._pendingProgress.delete(request.requestId);
                 }
             },
-            provideFollowups: async (request, result, token) => {
+            provideFollowups: async (request, result, history, token) => {
                 if (!this._agents.get(handle)?.hasFollowups) {
                     return [];
                 }
-                return this._proxy.$provideFollowups(request, handle, result, token);
-            },
-            getLastSlashCommands: (model) => {
-                return lastSlashCommands.get(model);
-            },
-            provideSlashCommands: async (model, history, token) => {
-                if (!this._agents.get(handle)?.hasSlashCommands) {
-                    return [];
-                }
-                const commands = await this._proxy.$provideSlashCommands(handle, { history }, token);
-                if (model) {
-                    lastSlashCommands.set(model, commands);
-                }
-                return commands;
+                return this._proxy.$provideFollowups(request, handle, result, { history }, token);
             },
             provideWelcomeMessage: (token) => {
                 return this._proxy.$provideWelcomeMessage(handle, token);
@@ -90,11 +80,26 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             provideSampleQuestions: (token) => {
                 return this._proxy.$provideSampleQuestions(handle, token);
             }
-        });
+        };
+        let disposable;
+        if (!staticAgentRegistration && dynamicProps) {
+            disposable = this._chatAgentService.registerDynamicAgent({
+                id,
+                name: dynamicProps.name,
+                description: dynamicProps.description,
+                extensionId: extension,
+                metadata: revive(metadata),
+                slashCommands: [],
+                locations: [ChatAgentLocation.Panel]
+            }, impl);
+        }
+        else {
+            disposable = this._chatAgentService.registerAgentImplementation(id, impl);
+        }
         this._agents.set(handle, {
-            name,
-            dispose: d.dispose,
-            hasSlashCommands: metadata.hasSlashCommands,
+            id: id,
+            extensionId: extension,
+            dispose: disposable.dispose,
             hasFollowups: metadata.hasFollowups
         });
     }
@@ -103,9 +108,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         if (!data) {
             throw new Error(`No agent with handle ${handle} registered`);
         }
-        data.hasSlashCommands = metadataUpdate.hasSlashCommands;
         data.hasFollowups = metadataUpdate.hasFollowups;
-        this._chatAgentService.updateAgent(data.name, revive(metadataUpdate));
+        this._chatAgentService.updateAgent(data.id, revive(metadataUpdate));
     }
     async $handleProgressChunk(requestId, progress) {
         const revivedProgress = revive(progress);
@@ -128,8 +132,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 }
                 const parsedRequest = this._instantiationService.createInstance(ChatRequestParser).parseChatRequest(widget.viewModel.sessionId, model.getValue()).parts;
                 const agentPart = parsedRequest.find((part) => part instanceof ChatRequestAgentPart);
-                const thisAgentName = this._agents.get(handle)?.name;
-                if (agentPart?.agent.id !== thisAgentName) {
+                const thisAgentId = this._agents.get(handle)?.id;
+                if (agentPart?.agent.id !== thisAgentId) {
                     return;
                 }
                 const range = computeCompletionRanges(model, position, wordRegex);