@codingame/monaco-vscode-chat-service-override 19.1.4 → 20.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup.js

@@ -43,7 +43,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { ProgressBadge } from '@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common/vscode/vs/workbench/services/activity/common/activity';
+import { ProgressBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtensionUrlHandlerOverrideRegistry } from '@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler';
@@ -58,19 +58,19 @@ import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatEntitlement, ChatEntitlementRequests, isProUser } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
+import { ChatEntitlement, ChatEntitlementRequests, isProUser } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
-import { ChatRequestModel } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestToolPart, ChatRequestAgentPart } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestModel } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestToolPart, ChatRequestAgentPart } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatConfiguration, ChatAgentLocation, ChatModeKind, validateChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { CHAT_SETUP_ACTION_ID, CHAT_CATEGORY, CHAT_OPEN_ACTION_ID } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { showCopilotView, ChatViewId } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { CHAT_SETUP_ACTION_ID, CHAT_CATEGORY, CHAT_OPEN_ACTION_ID } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { showCopilotView, ChatViewId } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { ChatMode } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { ChatMode } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 
 var SetupAgent_1, ChatSetup_1;
@@ -83,13 +83,7 @@ const defaultChat = {
     publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
     manageOveragesUrl: product.defaultChatAgent?.manageOverageUrl ?? '',
     upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
-    signUpUrl: product.defaultChatAgent?.signUpUrl ?? '',
-    providerId: product.defaultChatAgent?.providerId ?? '',
-    providerName: product.defaultChatAgent?.providerName ?? '',
-    enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
-    enterpriseProviderName: product.defaultChatAgent?.enterpriseProviderName ?? '',
-    alternativeProviderId: product.defaultChatAgent?.alternativeProviderId ?? '',
-    alternativeProviderName: product.defaultChatAgent?.alternativeProviderName ?? '',
+    provider: product.defaultChatAgent?.provider ?? { default: { id: '', name: '' }, enterprise: { id: '', name: '' }, apple: { id: '', name: '' }, google: { id: '', name: '' } },
     providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? '',
     providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
     manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
@@ -131,22 +125,22 @@ let SetupAgent = class SetupAgent extends Disposable {
                     id = 'setup.notebook';
                     break;
             }
-            return SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, id, `${defaultChat.providerName} Copilot`, true, description, location, mode, context, controller);
+            return SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, id, `${defaultChat.provider.default.name} Copilot`, true, description, location, mode, context, controller);
         });
     }
     static registerVSCodeAgent(instantiationService, context, controller) {
         return instantiationService.invokeFunction(accessor => {
             const chatAgentService = accessor.get(IChatAgentService);
             const disposables = ( new DisposableStore());
-            const { agent, disposable } = SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, ( localize2(4990, "Ask questions about VS Code")).value, ChatAgentLocation.Panel, undefined, context, controller);
+            const { agent, disposable } = SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, ( localize2(5089, "Ask questions about VS Code")).value, ChatAgentLocation.Panel, undefined, context, controller);
             disposables.add(disposable);
             disposables.add(SetupTool.registerTool(instantiationService, {
                 id: 'setup.tools.createNewWorkspace',
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(4991, "New Workspace")),
-                modelDescription: ( localize(4992, "Scaffold a new workspace in VS Code")),
-                userDescription: ( localize(4992, "Scaffold a new workspace in VS Code")),
+                displayName: ( localize(5090, "New Workspace")),
+                modelDescription: ( localize(5091, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(5091, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: 'new',
                 when: ContextKeyExpr.true(),
@@ -179,8 +173,8 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         return { agent, disposable: disposables };
     }
-    static { this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(4993, "You need to set up Copilot and be signed in to use Chat.")))); }
-    static { this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(4994, "You need to trust this workspace to use Chat.")))); }
+    static { this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(5092, "You need to set up Copilot and be signed in to use Chat.")))); }
+    static { this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(5093, "You need to trust this workspace to use Chat.")))); }
     constructor(context, controller, location, instantiationService, logService, configurationService, telemetryService, environmentService, workspaceTrustManagementService) {
         super();
         this.context = context;
@@ -220,7 +214,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: 'progressMessage',
-            content: ( new MarkdownString(( localize(4995, "Getting Copilot ready")))),
+            content: ( new MarkdownString(( localize(5094, "Getting Copilot ready")))),
         });
         await this.forwardRequestToCopilot(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
         return {};
@@ -232,7 +226,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         catch (error) {
             progress({
                 kind: 'warning',
-                content: ( new MarkdownString(( localize(4996, "Copilot failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(5095, "Copilot failed to get a response. Please try again."))))
             });
         }
     }
@@ -260,7 +254,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: 'progressMessage',
-                    content: ( new MarkdownString(( localize(4997, "Copilot is almost ready")))),
+                    content: ( new MarkdownString(( localize(5096, "Copilot is almost ready")))),
                 });
             }, 10000);
             try {
@@ -273,17 +267,17 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (ready === 'timedout') {
                         warningMessage = ( localize(
-                            4998,
+                            5097,
                             "Copilot took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.",
-                            defaultChat.providerName,
+                            defaultChat.provider.default.name,
                             defaultChat.chatExtensionId
                         ));
                     }
                     else {
                         warningMessage = ( localize(
-                            4999,
+                            5098,
                             "Copilot failed to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.",
-                            defaultChat.providerName,
+                            defaultChat.provider.default.name,
                             defaultChat.chatExtensionId
                         ));
                     }
@@ -306,13 +300,19 @@ let SetupAgent = class SetupAgent extends Disposable {
         });
     }
     whenLanguageModelReady(languageModelsService) {
-        for (const id of languageModelsService.getLanguageModelIds()) {
-            const model = languageModelsService.lookupLanguageModel(id);
-            if (model && model.isDefault) {
-                return;
+        const hasDefaultModel = () => {
+            for (const id of languageModelsService.getLanguageModelIds()) {
+                const model = languageModelsService.lookupLanguageModel(id);
+                if (model && model.isDefault) {
+                    return true;
+                }
             }
+            return false;
+        };
+        if (hasDefaultModel()) {
+            return;
         }
-        return Event.toPromise(Event.filter(languageModelsService.onDidChangeLanguageModels, e => e.added?.some(added => added.metadata.isDefault) ?? false));
+        return Event.toPromise(Event.filter(languageModelsService.onDidChangeLanguageModels, () => hasDefaultModel() ?? false));
     }
     whenToolsModelReady(languageModelToolsService, requestModel) {
         const needsToolsModel = ( requestModel.message.parts.some(part => part instanceof ChatRequestToolPart));
@@ -358,16 +358,16 @@ let SetupAgent = class SetupAgent extends Disposable {
                     progress({
                         kind: 'progressMessage',
                         content: ( new MarkdownString(( localize(
-                            5000,
+                            5099,
                             "Signing in to {0}.",
-                            ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
+                            ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id ? defaultChat.provider.enterprise.name : defaultChat.provider.default.name
                         )))),
                     });
                     break;
                 case ChatSetupStep.Installing:
                     progress({
                         kind: 'progressMessage',
-                        content: ( new MarkdownString(( localize(5001, "Getting Copilot ready")))),
+                        content: ( new MarkdownString(( localize(5100, "Getting Copilot ready")))),
                     });
                     break;
             }
@@ -396,7 +396,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             else {
                 progress({
                     kind: 'warning',
-                    content: ( new MarkdownString(( localize(5002, "Copilot setup failed."))))
+                    content: ( new MarkdownString(( localize(5101, "Copilot setup failed."))))
                 });
             }
         }
@@ -524,8 +524,8 @@ var ChatSetupStrategy;
     ChatSetupStrategy[ChatSetupStrategy["DefaultSetup"] = 1] = "DefaultSetup";
     ChatSetupStrategy[ChatSetupStrategy["SetupWithoutEnterpriseProvider"] = 2] = "SetupWithoutEnterpriseProvider";
     ChatSetupStrategy[ChatSetupStrategy["SetupWithEnterpriseProvider"] = 3] = "SetupWithEnterpriseProvider";
-    ChatSetupStrategy[ChatSetupStrategy["SetupWithAccountCreate"] = 4] = "SetupWithAccountCreate";
-    ChatSetupStrategy[ChatSetupStrategy["SetupWithAlternateProvider"] = 5] = "SetupWithAlternateProvider";
+    ChatSetupStrategy[ChatSetupStrategy["SetupWithGoogleProvider"] = 4] = "SetupWithGoogleProvider";
+    ChatSetupStrategy[ChatSetupStrategy["SetupWithAppleProvider"] = 5] = "SetupWithAppleProvider";
 })(ChatSetupStrategy || (ChatSetupStrategy = {}));
 let ChatSetup = class ChatSetup {
     static { ChatSetup_1 = this; }
@@ -545,14 +545,13 @@ let ChatSetup = class ChatSetup {
                     accessor.get(ILogService),
                     accessor.get(IConfigurationService),
                     accessor.get(IViewsService),
-                    accessor.get(IOpenerService),
                     accessor.get(IWorkspaceTrustRequestService)
                 ));
             });
         }
         return instance;
     }
-    constructor(context, controller, instantiationService, telemetryService, layoutService, keybindingService, chatEntitlementService, logService, configurationService, viewsService, openerService, workspaceTrustRequestService) {
+    constructor(context, controller, instantiationService, telemetryService, layoutService, keybindingService, chatEntitlementService, logService, configurationService, viewsService, workspaceTrustRequestService) {
         this.context = context;
         this.controller = controller;
         this.instantiationService = instantiationService;
@@ -563,7 +562,6 @@ let ChatSetup = class ChatSetup {
         this.logService = logService;
         this.configurationService = configurationService;
         this.viewsService = viewsService;
-        this.openerService = openerService;
         this.workspaceTrustRequestService = workspaceTrustRequestService;
         this.pendingRun = undefined;
         this.skipDialogOnce = false;
@@ -588,7 +586,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(5003, "Copilot is currently only supported in trusted workspaces."))
+            message: ( localize(5102, "Copilot is currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({ later: true });
@@ -596,13 +594,13 @@ let ChatSetup = class ChatSetup {
             return { dialogSkipped, success: undefined  };
         }
         let setupStrategy;
-        if (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free) {
+        if (!options?.forceSignInDialog && (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free)) {
             setupStrategy = ChatSetupStrategy.DefaultSetup;
         }
         else {
-            setupStrategy = await this.showDialog();
+            setupStrategy = await this.showDialog(options);
         }
-        if (setupStrategy === ChatSetupStrategy.DefaultSetup && ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
+        if (setupStrategy === ChatSetupStrategy.DefaultSetup && ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id) {
             setupStrategy = ChatSetupStrategy.SetupWithEnterpriseProvider;
         }
         if (setupStrategy !== ChatSetupStrategy.Canceled && !options?.disableChatViewReveal) {
@@ -612,20 +610,20 @@ let ChatSetup = class ChatSetup {
         try {
             switch (setupStrategy) {
                 case ChatSetupStrategy.SetupWithEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useAlternateProvider: false });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useSocialProvider: undefined });
                     break;
                 case ChatSetupStrategy.SetupWithoutEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useAlternateProvider: false });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: undefined });
+                    break;
+                case ChatSetupStrategy.SetupWithAppleProvider:
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'apple' });
                     break;
-                case ChatSetupStrategy.SetupWithAlternateProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useAlternateProvider: true });
+                case ChatSetupStrategy.SetupWithGoogleProvider:
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'google' });
                     break;
                 case ChatSetupStrategy.DefaultSetup:
                     success = await this.controller.value.setup();
                     break;
-                case ChatSetupStrategy.SetupWithAccountCreate:
-                    this.openerService.open(( URI.parse(defaultChat.signUpUrl)));
-                    return this.doRun(options);
                 case ChatSetupStrategy.Canceled:
                     this.context.update({ later: true });
                     this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedMaybeLater', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
@@ -638,94 +636,73 @@ let ChatSetup = class ChatSetup {
         }
         return { success, dialogSkipped };
     }
-    async showDialog() {
+    async showDialog(options) {
         const disposables = ( new DisposableStore());
         const dialogVariant = this.configurationService.getValue('chat.setup.signInDialogVariant');
-        const buttons = this.getButtons(dialogVariant);
-        const dialog = disposables.add(( new Dialog(this.layoutService.activeContainer, this.getDialogTitle(), ( buttons.map(button => button[0])), createWorkbenchDialogOptions({
-            type: 'none',
-            extraClasses: ['chat-setup-dialog'],
-            detail: ' ',
-            icon: Codicon.copilotLarge,
-            alignment: DialogContentsAlignment.Vertical,
-            cancelId: buttons.length - 1,
-            disableCloseButton: true,
-            renderFooter: this.telemetryService.telemetryLevel !== TelemetryLevel.NONE ? footer => footer.appendChild(this.createDialogFooter(disposables)) : undefined,
-            buttonOptions: ( buttons.map(button => button[2]))
-        }, this.keybindingService, this.layoutService))));
+        const buttons = this.getButtons(dialogVariant, options);
+        const dialog = disposables.add(( new Dialog(
+            this.layoutService.activeContainer,
+            this.getDialogTitle(options),
+            ( buttons.map(button => button[0])),
+            createWorkbenchDialogOptions({
+                type: 'none',
+                extraClasses: ['chat-setup-dialog'],
+                detail: ' ',
+                icon: Codicon.copilotLarge,
+                alignment: DialogContentsAlignment.Vertical,
+                cancelId: buttons.length - 1,
+                disableCloseButton: true,
+                renderFooter: this.telemetryService.telemetryLevel !== TelemetryLevel.NONE ? footer => footer.appendChild(this.createDialogFooter(disposables)) : undefined,
+                buttonOptions: ( buttons.map(button => button[2]))
+            }, this.keybindingService, this.layoutService)
+        )));
         const { button } = await dialog.show();
         disposables.dispose();
         return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
     }
-    getButtons(variant) {
+    getButtons(variant, options) {
+        const styleButton = (...classes) => ({ styleButton: (button) => button.element.classList.add(...classes) });
         let buttons;
-        if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            let alternateProvider = 'off';
-            if (defaultChat.alternativeProviderId) {
-                if (this.configurationService.getValue('chat.setup.signInWithAlternateProvider')) {
-                    alternateProvider = 'colorful';
-                }
-                switch (variant) {
-                    case 'alternate-first':
-                        alternateProvider = 'first';
-                        break;
-                    case 'alternate-color':
-                        alternateProvider = 'colorful';
-                        break;
-                    case 'alternate-monochrome':
-                        alternateProvider = 'monochrome';
-                        break;
-                }
-            }
-            if (ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
+        if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
+            const defaultProviderButton = [( localize(5103, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton('continue-button', 'default')];
+            const defaultProviderLink = [defaultProviderButton[0], defaultProviderButton[1], styleButton('link-button')];
+            const enterpriseProviderButton = [( localize(5103, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton('continue-button', 'default')];
+            const enterpriseProviderLink = [enterpriseProviderButton[0], enterpriseProviderButton[1], styleButton('link-button')];
+            const googleProviderButton = [( localize(5103, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton('continue-button', 'google')];
+            if (ChatEntitlementRequests.providerId(this.configurationService) !== defaultChat.provider.enterprise.id) {
                 buttons = coalesce([
-                    [( localize(5004, "Continue with {0}", defaultChat.enterpriseProviderName)), ChatSetupStrategy.SetupWithEnterpriseProvider, {
-                            styleButton: button => button.element.classList.add('continue-button', 'default')
-                        }],
-                    alternateProvider !== 'off' ? [( localize(5004, "Continue with {0}", defaultChat.alternativeProviderName)), ChatSetupStrategy.SetupWithAlternateProvider, {
-                            styleButton: button => button.element.classList.add('continue-button', 'alternate', alternateProvider)
-                        }] : undefined,
-                    [( localize(5005, "Sign in with a {0} account", defaultChat.providerName)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, {
-                            styleButton: button => button.element.classList.add('link-button')
-                        }]
+                    defaultProviderButton,
+                    variant === 'google' ? googleProviderButton : undefined,
+                    enterpriseProviderLink
                 ]);
             }
             else {
                 buttons = coalesce([
-                    [( localize(5004, "Continue with {0}", defaultChat.providerName)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, {
-                            styleButton: button => button.element.classList.add('continue-button', 'default')
-                        }],
-                    alternateProvider !== 'off' ? [( localize(5004, "Continue with {0}", defaultChat.alternativeProviderName)), ChatSetupStrategy.SetupWithAlternateProvider, {
-                            styleButton: button => button.element.classList.add('continue-button', 'alternate', alternateProvider)
-                        }] : undefined,
-                    [( localize(5005, "Sign in with a {0} account", defaultChat.enterpriseProviderName)), ChatSetupStrategy.SetupWithEnterpriseProvider, {
-                            styleButton: button => button.element.classList.add('link-button')
-                        }]
+                    enterpriseProviderButton,
+                    variant === 'google' ? googleProviderButton : undefined,
+                    defaultProviderLink
                 ]);
             }
-            if (alternateProvider === 'first') {
-                [buttons[0], buttons[1]] = [buttons[1], buttons[0]];
-            }
         }
         else {
-            buttons = [[( localize(5006, "Set up Copilot")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(5104, "Set up Copilot")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
-        buttons.push([( localize(5007, "Skip for now")), ChatSetupStrategy.Canceled, { styleButton: button => button.element.classList.add('link-button', 'skip-button') }]);
+        buttons.push([( localize(5105, "Skip for now")), ChatSetupStrategy.Canceled, styleButton('link-button', 'skip-button')]);
         return buttons;
     }
-    getDialogTitle() {
-        if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            return localize(5008, "Sign in to use Copilot");
+    getDialogTitle(options) {
+        if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
+            return localize(5106, "Sign in to use Copilot");
         }
-        return localize(5009, "Start using Copilot");
+        return localize(5107, "Start using Copilot");
     }
     createDialogFooter(disposables) {
         const element = $('.chat-setup-dialog-footer');
         const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
         const settings = ( localize(
-            5010,
+            5108,
             "{0} Copilot Free, Pro and Pro+ may show [public code]({1}) suggestions and we may use your data for product improvement. You can change these [settings]({2}) at any time.",
-            defaultChat.providerName,
+            defaultChat.provider.default.name,
             defaultChat.publicCodeMatchesUrl,
             defaultChat.manageSettingsUrl
         ));
@@ -742,8 +719,7 @@ ChatSetup = ChatSetup_1 = ( __decorate([
     ( __param(7, ILogService)),
     ( __param(8, IConfigurationService)),
     ( __param(9, IViewsService)),
-    ( __param(10, IOpenerService)),
-    ( __param(11, IWorkspaceTrustRequestService))
+    ( __param(10, IWorkspaceTrustRequestService))
 ], ChatSetup));
 let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatSetup'; }
@@ -803,7 +779,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     }
     registerActions(context, requests, controller) {
         const chatSetupTriggerContext = ( ContextKeyExpr.or(( ChatContextKeys.Setup.installed.negate()), ChatContextKeys.Entitlement.canSignUp));
-        const CHAT_SETUP_ACTION_LABEL = ( localize2(5011, "Use AI Features with Copilot for free..."));
+        const CHAT_SETUP_ACTION_LABEL = ( localize2(5109, "Use AI Features with Copilot for free..."));
         class ChatSetupTriggerAction extends Action2 {
             constructor() {
                 super({
@@ -814,7 +790,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     precondition: chatSetupTriggerContext
                 });
             }
-            async run(accessor, mode) {
+            async run(accessor, mode, options) {
                 const viewsService = accessor.get(IViewsService);
                 const layoutService = accessor.get(IWorkbenchLayoutService);
                 const instantiationService = accessor.get(IInstantiationService);
@@ -827,20 +803,34 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     chatWidget?.input.setChatMode(mode);
                 }
                 const setup = ChatSetup.getInstance(instantiationService, context, controller);
-                const { success } = await setup.run();
+                const { success } = await setup.run(options);
                 if (success === false && !lifecycleService.willShutdown) {
                     const { confirmed } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(5012, "Copilot setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(5013, "Retry")),
+                        message: ( localize(5110, "Copilot setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(5111, "Retry")),
                     });
                     if (confirmed) {
-                        return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID));
+                        return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
                     }
                 }
                 return Boolean(success);
             }
         }
+        class ChatSetupTriggerForceSignInDialogAction extends Action2 {
+            constructor() {
+                super({
+                    id: 'workbench.action.chat.triggerSetupForceSignIn',
+                    title: ( localize2(5112, "Sign in to use Copilot"))
+                });
+            }
+            async run(accessor) {
+                const commandService = accessor.get(ICommandService);
+                const telemetryService = accessor.get(ITelemetryService);
+                telemetryService.publicLog2('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
+                return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, { forceSignInDialog: true });
+            }
+        }
         class ChatSetupTriggerWithoutDialogAction extends Action2 {
             constructor() {
                 super({
@@ -856,14 +846,14 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 await context.update({ hidden: false });
                 const chatWidget = await showCopilotView(viewsService, layoutService);
                 ChatSetup.getInstance(instantiationService, context, controller).skipDialog();
-                chatWidget?.acceptInput(( localize(5014, "Set up Copilot.")));
+                chatWidget?.acceptInput(( localize(5113, "Set up Copilot.")));
             }
         }
         class ChatSetupFromAccountsAction extends Action2 {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupFromAccounts',
-                    title: ( localize2(5015, "Sign in to use Copilot...")),
+                    title: ( localize2(5114, "Sign in to use Copilot...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: '2_copilot',
@@ -880,7 +870,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         }
         class ChatSetupHideAction extends Action2 {
             static { this.ID = 'workbench.action.chat.hideSetup'; }
-            static { this.TITLE = ( localize2(5016, "Hide Copilot")); }
+            static { this.TITLE = ( localize2(5115, "Hide AI Features")); }
             constructor() {
                 super({
                     id: ChatSetupHideAction.ID,
@@ -901,13 +891,13 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const layoutService = accessor.get(IWorkbenchLayoutService);
                 const dialogService = accessor.get(IDialogService);
                 const { confirmed } = await dialogService.confirm({
-                    message: ( localize(5017, "Are you sure you want to hide Copilot?")),
+                    message: ( localize(5116, "Are you sure you want to hide AI features?")),
                     detail: ( localize(
-                        5018,
-                        "You can restore Copilot by running the '{0}' command.",
+                        5117,
+                        "You can restore AI features by running the '{0}' command.",
                         CHAT_SETUP_ACTION_LABEL.value
                     )),
-                    primaryButton: ( localize(5019, "Hide Copilot"))
+                    primaryButton: ( localize(5118, "Hide AI Features"))
                 });
                 if (!confirmed) {
                     return;
@@ -927,8 +917,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.upgradePlan',
-                    title: ( localize2(5020, "Upgrade to Copilot Pro")),
-                    category: ( localize2(5021, 'Chat')),
+                    title: ( localize2(5119, "Upgrade to Copilot Pro")),
+                    category: ( localize2(5120, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.canSignUp, ChatContextKeys.Entitlement.free)),
                     menu: {
@@ -966,8 +956,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.manageOverages',
-                    title: ( localize2(5022, "Manage Copilot Overages")),
-                    category: ( localize2(5021, 'Chat')),
+                    title: ( localize2(5121, "Manage Copilot Overages")),
+                    category: ( localize2(5120, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.pro, ChatContextKeys.Entitlement.proPlus)),
                     menu: {
@@ -987,6 +977,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             }
         }
         registerAction2(ChatSetupTriggerAction);
+        registerAction2(ChatSetupTriggerForceSignInDialogAction);
         registerAction2(ChatSetupFromAccountsAction);
         registerAction2(ChatSetupTriggerWithoutDialogAction);
         registerAction2(ChatSetupHideAction);
@@ -1056,7 +1047,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(5023, "Getting Copilot ready..."));
+        const title = ( localize(5122, "Getting Copilot ready..."));
         const badge = this.activityService.showViewContainerActivity(CHAT_SIDEBAR_PANEL_ID, {
             badge: ( new ProgressBadge(() => title)),
         });
@@ -1080,10 +1071,10 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             let entitlement;
             if (this.context.state.entitlement === ChatEntitlement.Unknown || options.forceSignIn) {
                 this.setStep(ChatSetupStep.SigningIn);
-                const result = await this.signIn({ useAlternateProvider: options.useAlternateProvider });
+                const result = await this.signIn(options);
                 if (!result.session) {
                     this.doInstall();
-                    const provider = options.useAlternateProvider ? defaultChat.alternativeProviderId : options.useEnterpriseProvider ? defaultChat.enterpriseProviderId : defaultChat.providerName;
+                    const provider = options.useSocialProvider ?? options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id;
                     this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
                     return undefined;
                 }
@@ -1112,12 +1103,12 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    5024,
+                    5123,
                     "Failed to sign in to {0}. Would you like to try again?",
-                    options?.useAlternateProvider ? defaultChat.alternativeProviderName : ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
+                    ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id ? defaultChat.provider.enterprise.name : defaultChat.provider.default.name
                 )),
-                detail: ( localize(5025, "You must be signed in to use Copilot.")),
-                primaryButton: ( localize(5013, "Retry"))
+                detail: ( localize(5124, "You must be signed in to use Copilot.")),
+                primaryButton: ( localize(5111, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(options);
@@ -1128,7 +1119,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     async install(session, entitlement, providerId, watch, options) {
         const wasRunning = this.context.state.installed && !this.context.state.disabled;
         let signUpResult = undefined;
-        const provider = options.useAlternateProvider ? defaultChat.alternativeProviderId : options.useEnterpriseProvider ? defaultChat.enterpriseProviderId : defaultChat.providerName;
+        const provider = options.useSocialProvider ?? options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id;
         try {
             if (entitlement !== ChatEntitlement.Free &&
                 !isProUser(entitlement) &&
@@ -1160,7 +1151,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         if (typeof signUpResult === 'boolean') {
             this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: wasRunning && !signUpResult ? 'alreadyInstalled' : 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
         }
-        if (wasRunning && signUpResult === true) {
+        if (wasRunning) {
             refreshTokens(this.commandService);
         }
         return true;
@@ -1179,11 +1170,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 const { confirmed } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        5026,
+                        5125,
                         "An error occurred while setting up Copilot. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(5013, "Retry"))
+                    primaryButton: ( localize(5111, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstallWithRetry();
@@ -1233,7 +1224,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         if (options.useEnterpriseProvider) {
             await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, {
                 ...existingAdvancedSetting,
-                'authProvider': defaultChat.enterpriseProviderId
+                'authProvider': defaultChat.provider.enterprise.id
             }, ConfigurationTarget.USER);
         }
         else {
@@ -1253,8 +1244,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(5027, "What is your {0} instance?", defaultChat.enterpriseProviderName)),
-            placeHolder: ( localize(5028, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
+            prompt: ( localize(5126, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
+            placeHolder: ( localize(5127, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async (value) => {
@@ -1265,16 +1256,16 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(5029, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(5128, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            5030,
+                            5129,
                             'You must enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")',
-                            defaultChat.enterpriseProviderName
+                            defaultChat.provider.enterprise.name
                         )),
                         severity: Severity.Error
                     };