@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.0

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

@@ -4,7 +4,6 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import * as chatSetup from './media/chatSetup.css';
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Dialog, DialogContentsAlignment } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/base/browser/ui/dialog/dialog';
-import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
@@ -20,7 +19,7 @@ import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/typ
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { MarkdownRenderer } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2, MenuId, registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId, registerAction2 } 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 { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -41,7 +40,7 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { TelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { IWorkspaceTrustRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
+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';
@@ -59,20 +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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
+import { ChatEntitlement, ChatEntitlementRequests, isProUser } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestToolPart, ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+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 { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatConfiguration, ChatAgentLocation, ChatMode, validateChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { showCopilotView, ChatViewId } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+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 { 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 { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
-import { ChatMode2 } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { ChatMode } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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;
@@ -86,6 +84,7 @@ const defaultChat = {
     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 ?? '',
@@ -99,7 +98,7 @@ const defaultChat = {
     completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
     chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
 };
-const ToolsAgentContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentEnabled}`, true)), ( ChatContextKeys.Editing.agentModeDisallowed.negate()),
+const ToolsAgentContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentEnabled}`, true)),
 ContextKeyExpr.not(`previewFeaturesDisabled`)));
 let SetupAgent = class SetupAgent extends Disposable {
     static { SetupAgent_1 = this; }
@@ -107,19 +106,19 @@ let SetupAgent = class SetupAgent extends Disposable {
         return instantiationService.invokeFunction(accessor => {
             const chatAgentService = accessor.get(IChatAgentService);
             let id;
-            let description = ChatMode2.Ask.description;
+            let description = ChatMode.Ask.description.get();
             switch (location) {
                 case ChatAgentLocation.Panel:
-                    if (mode === ChatMode.Ask) {
+                    if (mode === ChatModeKind.Ask) {
                         id = 'setup.chat';
                     }
-                    else if (mode === ChatMode.Edit) {
+                    else if (mode === ChatModeKind.Edit) {
                         id = 'setup.edits';
-                        description = ChatMode2.Edit.description;
+                        description = ChatMode.Edit.description.get();
                     }
                     else {
                         id = 'setup.agent';
-                        description = ChatMode2.Agent.description;
+                        description = ChatMode.Agent.description.get();
                     }
                     break;
                 case ChatAgentLocation.Terminal:
@@ -139,15 +138,15 @@ let SetupAgent = class SetupAgent extends Disposable {
         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(4899, "Ask questions about VS Code")).value, ChatAgentLocation.Panel, undefined, context, controller);
+            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);
             disposables.add(disposable);
             disposables.add(SetupTool.registerTool(instantiationService, {
                 id: 'setup.tools.createNewWorkspace',
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(4900, "New Workspace")),
-                modelDescription: ( localize(4901, "Scaffold a new workspace in VS Code")),
-                userDescription: ( localize(4901, "Scaffold a new workspace in VS Code")),
+                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")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: 'new',
                 when: ContextKeyExpr.true(),
@@ -162,8 +161,8 @@ let SetupAgent = class SetupAgent extends Disposable {
             name,
             isDefault,
             isCore: true,
-            modes: mode ? [mode] : [ChatMode.Ask],
-            when: mode === ChatMode.Agent ? ToolsAgentContextKey?.serialize() : undefined,
+            modes: mode ? [mode] : [ChatModeKind.Ask],
+            when: mode === ChatModeKind.Agent ? ToolsAgentContextKey?.serialize() : undefined,
             slashCommands: [],
             disambiguation: [],
             locations: [location],
@@ -175,13 +174,14 @@ let SetupAgent = class SetupAgent extends Disposable {
         }));
         const agent = disposables.add(instantiationService.createInstance(SetupAgent_1, context, controller, location));
         disposables.add(chatAgentService.registerAgentImplementation(id, agent));
-        if (mode === ChatMode.Agent) {
+        if (mode === ChatModeKind.Agent) {
             chatAgentService.updateAgent(id, { themeIcon: Codicon.tools });
         }
         return { agent, disposable: disposables };
     }
-    static { this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(4902, "You need to set up Copilot and be signed in to use Chat.")))); }
-    constructor(context, controller, location, instantiationService, logService, configurationService, telemetryService, environmentService) {
+    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.")))); }
+    constructor(context, controller, location, instantiationService, logService, configurationService, telemetryService, environmentService, workspaceTrustManagementService) {
         super();
         this.context = context;
         this.controller = controller;
@@ -191,6 +191,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         this.configurationService = configurationService;
         this.telemetryService = telemetryService;
         this.environmentService = environmentService;
+        this.workspaceTrustManagementService = workspaceTrustManagementService;
         this._onUnresolvableError = this._register(( new Emitter()));
         this.onUnresolvableError = this._onUnresolvableError.event;
         this.pendingForwardedRequests = ( new Map());
@@ -206,7 +207,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         });
     }
     async doInvoke(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService) {
-        if (!this.context.state.installed || this.context.state.disabled || this.context.state.entitlement === ChatEntitlement.Available || this.context.state.entitlement === ChatEntitlement.Unknown) {
+        if (!this.context.state.installed || this.context.state.disabled || this.context.state.untrusted || this.context.state.entitlement === ChatEntitlement.Available || this.context.state.entitlement === ChatEntitlement.Unknown) {
             return this.doInvokeWithSetup(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
         }
         return this.doInvokeWithoutSetup(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
@@ -219,7 +220,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: 'progressMessage',
-            content: ( new MarkdownString(( localize(4903, "Getting Copilot ready.")))),
+            content: ( new MarkdownString(( localize(4995, "Getting Copilot ready")))),
         });
         await this.forwardRequestToCopilot(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
         return {};
@@ -231,7 +232,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         catch (error) {
             progress({
                 kind: 'warning',
-                content: ( new MarkdownString(( localize(4904, "Copilot failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(4996, "Copilot failed to get a response. Please try again."))))
             });
         }
     }
@@ -250,7 +251,7 @@ let SetupAgent = class SetupAgent extends Disposable {
     }
     async doForwardRequestToCopilotWhenReady(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService) {
         const widget = chatWidgetService.getWidgetBySessionId(requestModel.session.sessionId);
-        const mode = widget?.input.currentMode;
+        const mode = widget?.input.currentModeKind;
         const languageModel = widget?.input.currentLanguageModel;
         const whenAgentReady = this.whenAgentReady(chatAgentService, mode);
         const whenLanguageModelReady = this.whenLanguageModelReady(languageModelsService);
@@ -259,7 +260,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: 'progressMessage',
-                    content: ( new MarkdownString(( localize(4905, "Copilot is almost ready.")))),
+                    content: ( new MarkdownString(( localize(4997, "Copilot is almost ready")))),
                 });
             }, 10000);
             try {
@@ -272,7 +273,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (ready === 'timedout') {
                         warningMessage = ( localize(
-                            4906,
+                            4998,
                             "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.chatExtensionId
@@ -280,7 +281,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                     }
                     else {
                         warningMessage = ( localize(
-                            4907,
+                            4999,
                             "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.chatExtensionId
@@ -299,9 +300,9 @@ let SetupAgent = class SetupAgent extends Disposable {
             }
         }
         await chatService.resendRequest(requestModel, {
+            ...widget?.getModeRequestOptions(),
             mode,
             userSelectedModelId: languageModel,
-            userSelectedTools: widget?.getUserSelectedTools()
         });
     }
     whenLanguageModelReady(languageModelsService) {
@@ -319,13 +320,13 @@ let SetupAgent = class SetupAgent extends Disposable {
             return;
         }
         for (const tool of languageModelToolsService.getTools()) {
-            if (tool.source.type !== 'internal') {
+            if (tool.id.startsWith('copilot_')) {
                 return;
             }
         }
         return Event.toPromise(Event.filter(languageModelToolsService.onDidChangeTools, () => {
             for (const tool of languageModelToolsService.getTools()) {
-                if (tool.source.type !== 'internal') {
+                if (tool.id.startsWith('copilot_')) {
                     return true;
                 }
             }
@@ -349,14 +350,15 @@ let SetupAgent = class SetupAgent extends Disposable {
     }
     async doInvokeWithSetup(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService) {
         this.telemetryService.publicLog2('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'chat' });
-        const requestModel = chatWidgetService.getWidgetBySessionId(request.sessionId)?.viewModel?.model.getRequests().at(-1);
+        const widget = chatWidgetService.getWidgetBySessionId(request.sessionId);
+        const requestModel = widget?.viewModel?.model.getRequests().at(-1);
         const setupListener = Event.runAndSubscribe(this.controller.value.onDidChange, (() => {
             switch (this.controller.value.step) {
                 case ChatSetupStep.SigningIn:
                     progress({
                         kind: 'progressMessage',
                         content: ( new MarkdownString(( localize(
-                            4908,
+                            5000,
                             "Signing in to {0}.",
                             ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
                         )))),
@@ -365,7 +367,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 case ChatSetupStep.Installing:
                     progress({
                         kind: 'progressMessage',
-                        content: ( new MarkdownString(( localize(4909, "Getting Copilot ready.")))),
+                        content: ( new MarkdownString(( localize(5001, "Getting Copilot ready")))),
                     });
                     break;
             }
@@ -383,10 +385,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         if (typeof result?.success === 'boolean') {
             if (result.success) {
                 if (result.dialogSkipped) {
-                    progress({
-                        kind: 'markdownContent',
-                        content: ( new MarkdownString(( localize(4910, "Copilot setup finished successfully."))))
-                    });
+                    widget?.clear();
                 }
                 else if (requestModel) {
                     let newRequest = this.replaceAgentInRequestModel(requestModel, chatAgentService);
@@ -397,14 +396,14 @@ let SetupAgent = class SetupAgent extends Disposable {
             else {
                 progress({
                     kind: 'warning',
-                    content: ( new MarkdownString(( localize(4911, "Copilot setup failed."))))
+                    content: ( new MarkdownString(( localize(5002, "Copilot setup failed."))))
                 });
             }
         }
         else {
             progress({
                 kind: 'markdownContent',
-                content: SetupAgent_1.SETUP_NEEDED_MESSAGE,
+                content: this.workspaceTrustManagementService.isWorkspaceTrusted() ? SetupAgent_1.SETUP_NEEDED_MESSAGE : SetupAgent_1.TRUST_NEEDED_MESSAGE
             });
         }
         return {};
@@ -490,7 +489,8 @@ SetupAgent = SetupAgent_1 = ( __decorate([
     ( __param(4, ILogService)),
     ( __param(5, IConfigurationService)),
     ( __param(6, ITelemetryService)),
-    ( __param(7, IWorkbenchEnvironmentService))
+    ( __param(7, IWorkbenchEnvironmentService)),
+    ( __param(8, IWorkspaceTrustManagementService))
 ], SetupAgent));
 class SetupTool extends Disposable {
     static registerTool(instantiationService, toolData) {
@@ -525,6 +525,7 @@ var ChatSetupStrategy;
     ChatSetupStrategy[ChatSetupStrategy["SetupWithoutEnterpriseProvider"] = 2] = "SetupWithoutEnterpriseProvider";
     ChatSetupStrategy[ChatSetupStrategy["SetupWithEnterpriseProvider"] = 3] = "SetupWithEnterpriseProvider";
     ChatSetupStrategy[ChatSetupStrategy["SetupWithAccountCreate"] = 4] = "SetupWithAccountCreate";
+    ChatSetupStrategy[ChatSetupStrategy["SetupWithAlternateProvider"] = 5] = "SetupWithAlternateProvider";
 })(ChatSetupStrategy || (ChatSetupStrategy = {}));
 let ChatSetup = class ChatSetup {
     static { ChatSetup_1 = this; }
@@ -544,15 +545,14 @@ let ChatSetup = class ChatSetup {
                     accessor.get(ILogService),
                     accessor.get(IConfigurationService),
                     accessor.get(IViewsService),
-                    accessor.get(IProductService),
                     accessor.get(IOpenerService),
-                    accessor.get(IContextMenuService)
+                    accessor.get(IWorkspaceTrustRequestService)
                 ));
             });
         }
         return instance;
     }
-    constructor(context, controller, instantiationService, telemetryService, layoutService, keybindingService, chatEntitlementService, logService, configurationService, viewsService, productService, openerService, contextMenuService) {
+    constructor(context, controller, instantiationService, telemetryService, layoutService, keybindingService, chatEntitlementService, logService, configurationService, viewsService, openerService, workspaceTrustRequestService) {
         this.context = context;
         this.controller = controller;
         this.instantiationService = instantiationService;
@@ -563,9 +563,8 @@ let ChatSetup = class ChatSetup {
         this.logService = logService;
         this.configurationService = configurationService;
         this.viewsService = viewsService;
-        this.productService = productService;
         this.openerService = openerService;
-        this.contextMenuService = contextMenuService;
+        this.workspaceTrustRequestService = workspaceTrustRequestService;
         this.pendingRun = undefined;
         this.skipDialogOnce = false;
     }
@@ -588,6 +587,14 @@ let ChatSetup = class ChatSetup {
         this.context.update({ later: false });
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
+        const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
+            message: ( localize(5003, "Copilot is currently only supported in trusted workspaces."))
+        });
+        if (!trusted) {
+            this.context.update({ later: true });
+            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
+            return { dialogSkipped, success: undefined  };
+        }
         let setupStrategy;
         if (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free) {
             setupStrategy = ChatSetupStrategy.DefaultSetup;
@@ -605,10 +612,13 @@ let ChatSetup = class ChatSetup {
         try {
             switch (setupStrategy) {
                 case ChatSetupStrategy.SetupWithEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useAlternateProvider: false });
                     break;
                 case ChatSetupStrategy.SetupWithoutEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useAlternateProvider: false });
+                    break;
+                case ChatSetupStrategy.SetupWithAlternateProvider:
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useAlternateProvider: true });
                     break;
                 case ChatSetupStrategy.DefaultSetup:
                     success = await this.controller.value.setup();
@@ -618,7 +628,7 @@ let ChatSetup = class ChatSetup {
                     return this.doRun(options);
                 case ChatSetupStrategy.Canceled:
                     this.context.update({ later: true });
-                    this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedMaybeLater', installDuration: 0, signUpErrorCode: undefined });
+                    this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedMaybeLater', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
                     break;
             }
         }
@@ -629,180 +639,91 @@ let ChatSetup = class ChatSetup {
         return { success, dialogSkipped };
     }
     async showDialog() {
-        let dialogVariant = this.configurationService.getValue('chat.setup.signInDialogVariant');
-        if (this.context.state.entitlement !== ChatEntitlement.Unknown && (dialogVariant === 'input-email' || dialogVariant === 'account-create')) {
-            dialogVariant = this.productService.quality !== 'stable' ? 'modern' : 'default';
-        }
-        if (dialogVariant === 'default') {
-            return this.showLegacyDialog();
-        }
         const disposables = ( new DisposableStore());
+        const dialogVariant = this.configurationService.getValue('chat.setup.signInDialogVariant');
         const buttons = this.getButtons(dialogVariant);
-        let icon;
-        switch (dialogVariant) {
-            case 'brand-gh':
-                icon = Codicon.github;
-                break;
-            case 'brand-vsc':
-                icon = this.productService.quality === 'stable' ? Codicon.vscode : this.productService.quality === 'insider' ? Codicon.vscodeInsiders : Codicon.codeOss;
-                break;
-            default:
-                icon = Codicon.copilotLarge;
-                break;
-        }
-        const dialog = disposables.add(( new Dialog(
-            this.layoutService.activeContainer,
-            this.getDialogTitle(dialogVariant),
-            ( buttons.map(button => button[0])),
-            createWorkbenchDialogOptions({
-                type: 'none',
-                extraClasses: coalesce([
-                    'chat-setup-dialog',
-                    dialogVariant === 'style-glow' ? 'chat-setup-glow' : undefined,
-                    dialogVariant === 'input-email' ? 'chat-setup-input-email' : undefined
-                ]),
-                detail: ' ',
-                icon,
-                alignment: DialogContentsAlignment.Vertical,
-                cancelId: buttons.length - 1,
-                inputs: this.getInputs(dialogVariant),
-                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 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 { button } = await dialog.show();
         disposables.dispose();
         return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
     }
-    getInputs(variant) {
-        if (variant !== 'input-email') {
-            return undefined;
-        }
-        return [{ placeholder: ( localize(4912, "Enter your email or {0} username", defaultChat.providerName)) }];
-    }
     getButtons(variant) {
         let buttons;
         if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            const supportAlternateProvider = this.configurationService.getValue('chat.setup.signInWithAlternateProvider') === true && defaultChat.alternativeProviderId;
-            switch (variant) {
-                case 'input-email':
-                    buttons = coalesce([
-                        [( localize(4913, "Continue")), ChatSetupStrategy.SetupWithoutEnterpriseProvider, undefined],
-                        [( localize(4914, "Create a New Account")), ChatSetupStrategy.SetupWithAccountCreate, {
-                                styleButton: button => {
-                                    button.element.classList.add('link-button');
-                                    const separator = button.element.parentElement?.appendChild($('.buttons-separator'));
-                                    separator?.appendChild($('.buttons-separator-left'));
-                                    separator?.appendChild($('.buttons-separator-center', undefined, ( localize(4915, "Or"))));
-                                    separator?.appendChild($('.buttons-separator-right'));
-                                }
-                            }],
-                        supportAlternateProvider ? [( localize(4916, "Continue with {0}", defaultChat.alternativeProviderName)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, {
-                                styleButton: button => {
-                                    button.element.classList.add('continue-button', 'alternate');
-                                }
-                            }] : undefined,
-                        [( localize(4916, "Continue with {0}", defaultChat.enterpriseProviderName)), ChatSetupStrategy.SetupWithEnterpriseProvider, {
-                                styleButton: button => {
-                                    button.element.classList.add('continue-button', 'default');
-                                }
-                            }]
-                    ]);
-                    break;
-                default:
-                    if (ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
-                        buttons = coalesce([
-                            [( localize(4916, "Continue with {0}", defaultChat.enterpriseProviderName)), ChatSetupStrategy.SetupWithEnterpriseProvider, {
-                                    styleButton: button => {
-                                        button.element.classList.add('continue-button', 'default');
-                                    }
-                                }],
-                            supportAlternateProvider ? [( localize(4916, "Continue with {0}", defaultChat.alternativeProviderName)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, {
-                                    styleButton: button => {
-                                        button.element.classList.add('continue-button', 'alternate');
-                                    }
-                                }] : undefined,
-                            [variant !== 'account-create' ? ( localize(4917, "Sign in with a {0} account", defaultChat.providerName)) : ( localize(4918, "Continue with {0}", defaultChat.providerName)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, {
-                                    styleButton: button => {
-                                        if (variant !== 'account-create') {
-                                            button.element.classList.add('link-button');
-                                        }
-                                        else {
-                                            button.element.classList.add('continue-button', 'default');
-                                        }
-                                    }
-                                }]
-                        ]);
-                    }
-                    else {
-                        buttons = coalesce([
-                            [( localize(4916, "Continue with {0}", defaultChat.providerName)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, {
-                                    styleButton: button => {
-                                        button.element.classList.add('continue-button', 'default');
-                                    }
-                                }],
-                            supportAlternateProvider ? [( localize(4916, "Continue with {0}", defaultChat.alternativeProviderName)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, {
-                                    styleButton: button => {
-                                        button.element.classList.add('continue-button', 'alternate');
-                                    }
-                                }] : undefined,
-                            [variant !== 'account-create' ? ( localize(4917, "Sign in with a {0} account", defaultChat.enterpriseProviderName)) : ( localize(4918, "Continue with {0}", defaultChat.enterpriseProviderName)), ChatSetupStrategy.SetupWithEnterpriseProvider, {
-                                    styleButton: button => {
-                                        if (variant !== 'account-create') {
-                                            button.element.classList.add('link-button');
-                                        }
-                                        else {
-                                            button.element.classList.add('continue-button', 'default');
-                                        }
-                                    }
-                                }]
-                        ]);
-                    }
-                    if (supportAlternateProvider && variant === 'alt-first') {
-                        [buttons[0], buttons[1]] = [buttons[1], buttons[0]];
-                    }
-                    if (variant === 'account-create') {
-                        buttons.push([( localize(4914, "Create a New Account")), ChatSetupStrategy.SetupWithAccountCreate, {
-                                styleButton: button => {
-                                    button.element.classList.add('link-button');
-                                }
-                            }]);
-                    }
-                    break;
+            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) {
+                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')
+                        }]
+                ]);
+            }
+            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')
+                        }]
+                ]);
+            }
+            if (alternateProvider === 'first') {
+                [buttons[0], buttons[1]] = [buttons[1], buttons[0]];
             }
         }
         else {
-            buttons = [[( localize(4919, "Set up Copilot")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(5006, "Set up Copilot")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
-        buttons.push([( localize(4920, "Skip for now")), ChatSetupStrategy.Canceled, { styleButton: button => button.element.classList.add('link-button', 'skip-button') }]);
+        buttons.push([( localize(5007, "Skip for now")), ChatSetupStrategy.Canceled, { styleButton: button => button.element.classList.add('link-button', 'skip-button') }]);
         return buttons;
     }
-    getDialogTitle(variant) {
+    getDialogTitle() {
         if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            switch (variant) {
-                case 'brand-gh':
-                    return localize(4921, "Sign in to use {0} Copilot", defaultChat.providerName);
-                case 'brand-vsc':
-                    return localize(4922, "Sign in to use AI");
-                default:
-                    return localize(4923, "Sign in to use Copilot");
-            }
-        }
-        switch (variant) {
-            case 'brand-gh':
-                return localize(4924, "Start using {0} Copilot", defaultChat.providerName);
-            case 'brand-vsc':
-                return localize(4925, "Start using AI");
-            default:
-                return localize(4926, "Start using Copilot");
+            return localize(5008, "Sign in to use Copilot");
         }
+        return localize(5009, "Start using Copilot");
     }
     createDialogFooter(disposables) {
         const element = $('.chat-setup-dialog-footer');
         const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
         const settings = ( localize(
-            4927,
+            5010,
             "{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.publicCodeMatchesUrl,
@@ -811,72 +732,6 @@ let ChatSetup = class ChatSetup {
         element.appendChild($('p', undefined, disposables.add(markdown.render(( new MarkdownString(settings, { isTrusted: true })))).element));
         return element;
     }
-    async showLegacyDialog() {
-        const disposables = ( new DisposableStore());
-        let result = undefined;
-        const buttons = [this.getLegacyPrimaryButton(), ( localize(4928, "Maybe Later"))];
-        const dialog = disposables.add(( new Dialog(
-            this.layoutService.activeContainer,
-            this.getLegacyDialogTitle(),
-            buttons,
-            createWorkbenchDialogOptions({
-                type: 'none',
-                icon: Codicon.copilotLarge,
-                cancelId: buttons.length - 1,
-                renderBody: body => body.appendChild(this.createLegacyDialog(disposables)),
-                primaryButtonDropdown: {
-                    contextMenuProvider: this.contextMenuService,
-                    addPrimaryActionToDropdown: false,
-                    actions: [
-                        toAction({ id: 'setupWithProvider', label: ( localize(4929, "Sign in with a {0} Account", defaultChat.providerName)), run: () => result = ChatSetupStrategy.SetupWithoutEnterpriseProvider }),
-                        toAction({ id: 'setupWithEnterpriseProvider', label: ( localize(4930, "Sign in with a {0} Account", defaultChat.enterpriseProviderName)), run: () => result = ChatSetupStrategy.SetupWithEnterpriseProvider }),
-                    ]
-                }
-            }, this.keybindingService, this.layoutService)
-        )));
-        const { button } = await dialog.show();
-        disposables.dispose();
-        return button === 0 ? result ?? ChatSetupStrategy.DefaultSetup : ChatSetupStrategy.Canceled;
-    }
-    getLegacyPrimaryButton() {
-        if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            if (ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
-                return localize(4931, "Sign in with {0}", defaultChat.enterpriseProviderName);
-            }
-            return localize(4932, "Sign in");
-        }
-        return localize(4933, "Use Copilot");
-    }
-    getLegacyDialogTitle() {
-        if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            return this.context.state.registered ? ( localize(4934, "Sign in to use Copilot")) : ( localize(4935, "Sign in to use Copilot for free"));
-        }
-        if (isProUser(this.context.state.entitlement)) {
-            return localize(4936, "Start using Copilot Pro");
-        }
-        return this.context.state.registered ? ( localize(4937, "Start using Copilot")) : ( localize(4938, "Start using Copilot for free"));
-    }
-    createLegacyDialog(disposables) {
-        const element = $('.chat-setup-dialog-legacy');
-        const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
-        const header = ( localize(
-            4939,
-            "[Copilot]({0}) is your AI pair programmer. Write code faster with completions, fix bugs and build new features across multiple files, and learn about your codebase through chat.",
-            defaultChat.documentationUrl
-        ));
-        element.appendChild($('p.setup-header', undefined, disposables.add(markdown.render(( new MarkdownString(header, { isTrusted: true })))).element));
-        if (this.telemetryService.telemetryLevel !== TelemetryLevel.NONE) {
-            const settings = ( localize(
-                4927,
-                "{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.publicCodeMatchesUrl,
-                defaultChat.manageSettingsUrl
-            ));
-            element.appendChild($('p.setup-settings', undefined, disposables.add(markdown.render(( new MarkdownString(settings, { isTrusted: true })))).element));
-        }
-        return element;
-    }
 };
 ChatSetup = ChatSetup_1 = ( __decorate([
     ( __param(2, IInstantiationService)),
@@ -887,9 +742,8 @@ ChatSetup = ChatSetup_1 = ( __decorate([
     ( __param(7, ILogService)),
     ( __param(8, IConfigurationService)),
     ( __param(9, IViewsService)),
-    ( __param(10, IProductService)),
-    ( __param(11, IOpenerService)),
-    ( __param(12, IContextMenuService))
+    ( __param(10, IOpenerService)),
+    ( __param(11, IWorkspaceTrustRequestService))
 ], ChatSetup));
 let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatSetup'; }
@@ -910,7 +764,6 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         ));
         this.registerSetupAgents(context, controller);
         this.registerActions(context, requests, controller);
-        this.registerMenus();
         this.registerUrlLinkHandler();
     }
     registerSetupAgents(context, controller) {
@@ -921,7 +774,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 if (!defaultAgentDisposables.value) {
                     const disposables = defaultAgentDisposables.value = ( new DisposableStore());
                     const panelAgentDisposables = disposables.add(( new DisposableStore()));
-                    for (const mode of [ChatMode.Ask, ChatMode.Edit, ChatMode.Agent]) {
+                    for (const mode of [ChatModeKind.Ask, ChatModeKind.Edit, ChatModeKind.Agent]) {
                         const { agent, disposable } = SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Panel, mode, context, controller);
                         panelAgentDisposables.add(disposable);
                         panelAgentDisposables.add(agent.onUnresolvableError(() => {
@@ -950,7 +803,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(4940, "Use AI Features with Copilot for free..."));
+        const CHAT_SETUP_ACTION_LABEL = ( localize2(5011, "Use AI Features with Copilot for free..."));
         class ChatSetupTriggerAction extends Action2 {
             constructor() {
                 super({
@@ -978,8 +831,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 if (success === false && !lifecycleService.willShutdown) {
                     const { confirmed } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(4941, "Copilot setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(4942, "Retry")),
+                        message: ( localize(5012, "Copilot setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(5013, "Retry")),
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID));
@@ -1003,14 +856,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(4943, "Set up Copilot.")));
+                chatWidget?.acceptInput(( localize(5014, "Set up Copilot.")));
             }
         }
         class ChatSetupFromAccountsAction extends Action2 {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupFromAccounts',
-                    title: ( localize2(4944, "Sign in to use Copilot...")),
+                    title: ( localize2(5015, "Sign in to use Copilot...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: '2_copilot',
@@ -1027,7 +880,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         }
         class ChatSetupHideAction extends Action2 {
             static { this.ID = 'workbench.action.chat.hideSetup'; }
-            static { this.TITLE = ( localize2(4945, "Hide Copilot")); }
+            static { this.TITLE = ( localize2(5016, "Hide Copilot")); }
             constructor() {
                 super({
                     id: ChatSetupHideAction.ID,
@@ -1048,13 +901,13 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const layoutService = accessor.get(IWorkbenchLayoutService);
                 const dialogService = accessor.get(IDialogService);
                 const { confirmed } = await dialogService.confirm({
-                    message: ( localize(4946, "Are you sure you want to hide Copilot?")),
+                    message: ( localize(5017, "Are you sure you want to hide Copilot?")),
                     detail: ( localize(
-                        4947,
+                        5018,
                         "You can restore Copilot by running the '{0}' command.",
                         CHAT_SETUP_ACTION_LABEL.value
                     )),
-                    primaryButton: ( localize(4948, "Hide Copilot"))
+                    primaryButton: ( localize(5019, "Hide Copilot"))
                 });
                 if (!confirmed) {
                     return;
@@ -1074,8 +927,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.upgradePlan',
-                    title: ( localize2(4949, "Upgrade to Copilot Pro")),
-                    category: ( localize2(4950, 'Chat')),
+                    title: ( localize2(5020, "Upgrade to Copilot Pro")),
+                    category: ( localize2(5021, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.canSignUp, ChatContextKeys.Entitlement.free)),
                     menu: {
@@ -1113,8 +966,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.manageOverages',
-                    title: ( localize2(4951, "Manage Copilot Overages")),
-                    category: ( localize2(4950, 'Chat')),
+                    title: ( localize2(5022, "Manage Copilot Overages")),
+                    category: ( localize2(5021, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.pro, ChatContextKeys.Entitlement.proPlus)),
                     menu: {
@@ -1140,28 +993,6 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         registerAction2(UpgradePlanAction);
         registerAction2(EnableOveragesAction);
     }
-    registerMenus() {
-        const menuContext = ( ContextKeyExpr.and((
-        ChatContextKeys.Setup.installed.negate()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabled.negate())));
-        MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
-            submenu: MenuId.ChatExplorerMenu,
-            group: '5_copilot',
-            title: ( localize(4952, "Copilot")),
-            when: menuContext
-        });
-        MenuRegistry.appendMenuItem(MenuId.EditorContext, {
-            submenu: MenuId.ChatTextEditorMenu,
-            group: '1_copilot',
-            title: ( localize(4952, "Copilot")),
-            when: menuContext
-        });
-        MenuRegistry.appendMenuItem(MenuId.TerminalInstanceContext, {
-            submenu: MenuId.ChatTerminalMenu,
-            group: '2_copilot',
-            title: ( localize(4952, "Copilot")),
-            when: menuContext
-        });
-    }
     registerUrlLinkHandler() {
         this._register(ExtensionUrlHandlerOverrideRegistry.registerHandler({
             canHandleURL: url => {
@@ -1192,7 +1023,7 @@ var ChatSetupStep;
 })(ChatSetupStep || (ChatSetupStep = {}));
 let ChatSetupController = class ChatSetupController extends Disposable {
     get step() { return this._step; }
-    constructor(context, requests, telemetryService, authenticationService, extensionsWorkbenchService, productService, logService, progressService, activityService, commandService, workspaceTrustRequestService, dialogService, configurationService, lifecycleService, quickInputService) {
+    constructor(context, requests, telemetryService, authenticationService, extensionsWorkbenchService, productService, logService, progressService, activityService, commandService, dialogService, configurationService, lifecycleService, quickInputService) {
         super();
         this.context = context;
         this.requests = requests;
@@ -1204,7 +1035,6 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         this.progressService = progressService;
         this.activityService = activityService;
         this.commandService = commandService;
-        this.workspaceTrustRequestService = workspaceTrustRequestService;
         this.dialogService = dialogService;
         this.configurationService = configurationService;
         this.lifecycleService = lifecycleService;
@@ -1226,7 +1056,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(4953, "Getting Copilot ready..."));
+        const title = ( localize(5023, "Getting Copilot ready..."));
         const badge = this.activityService.showViewContainerActivity(CHAT_SIDEBAR_PANEL_ID, {
             badge: ( new ProgressBadge(() => title)),
         });
@@ -1250,24 +1080,18 @@ 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(providerId);
+                const result = await this.signIn({ useAlternateProvider: options.useAlternateProvider });
                 if (!result.session) {
                     this.doInstall();
-                    this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined });
+                    const provider = options.useAlternateProvider ? defaultChat.alternativeProviderId : options.useEnterpriseProvider ? defaultChat.enterpriseProviderId : defaultChat.providerName;
+                    this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
                     return undefined;
                 }
                 session = result.session;
                 entitlement = result.entitlement;
             }
-            const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-                message: ( localize(4954, "Copilot is currently only supported in trusted workspaces."))
-            });
-            if (!trusted) {
-                this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: watch.elapsed(), signUpErrorCode: undefined });
-                return false;
-            }
             this.setStep(ChatSetupStep.Installing);
-            success = await this.install(session, entitlement ?? this.context.state.entitlement, providerId, watch);
+            success = await this.install(session, entitlement ?? this.context.state.entitlement, providerId, watch, options);
         }
         finally {
             this.setStep(ChatSetupStep.Initial);
@@ -1275,11 +1099,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         return success;
     }
-    async signIn(providerId) {
+    async signIn(options) {
         let session;
         let entitlements;
         try {
-            ({ session, entitlements } = await this.requests.signIn());
+            ({ session, entitlements } = await this.requests.signIn(options));
         }
         catch (e) {
             this.logService.error(`[chat setup] signIn: error ${e}`);
@@ -1288,22 +1112,23 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    4955,
+                    5024,
                     "Failed to sign in to {0}. Would you like to try again?",
-                    ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
+                    options?.useAlternateProvider ? defaultChat.alternativeProviderName : ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
                 )),
-                detail: ( localize(4956, "You must be signed in to use Copilot.")),
-                primaryButton: ( localize(4942, "Retry"))
+                detail: ( localize(5025, "You must be signed in to use Copilot.")),
+                primaryButton: ( localize(5013, "Retry"))
             });
             if (confirmed) {
-                return this.signIn(providerId);
+                return this.signIn(options);
             }
         }
         return { session, entitlement: entitlements?.entitlement };
     }
-    async install(session, entitlement, providerId, watch) {
+    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;
         try {
             if (entitlement !== ChatEntitlement.Free &&
                 !isProUser(entitlement) &&
@@ -1316,24 +1141,24 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                     catch (error) {
                     }
                     if (!session) {
-                        this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNoSession', installDuration: watch.elapsed(), signUpErrorCode: undefined });
+                        this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNoSession', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
                         return false;
                     }
                 }
                 signUpResult = await this.requests.signUpFree(session);
                 if (typeof signUpResult !== 'boolean' ) {
-                    this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode });
+                    this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode, provider });
                 }
             }
             await this.doInstallWithRetry();
         }
         catch (error) {
             this.logService.error(`[chat setup] install: error ${error}`);
-            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: isCancellationError(error) ? 'cancelled' : 'failedInstall', installDuration: watch.elapsed(), signUpErrorCode: undefined });
+            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: isCancellationError(error) ? 'cancelled' : 'failedInstall', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
             return false;
         }
         if (typeof signUpResult === 'boolean') {
-            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: wasRunning && !signUpResult ? 'alreadyInstalled' : 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined });
+            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: wasRunning && !signUpResult ? 'alreadyInstalled' : 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
         }
         if (wasRunning && signUpResult === true) {
             refreshTokens(this.commandService);
@@ -1354,11 +1179,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 const { confirmed } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        4957,
+                        5026,
                         "An error occurred while setting up Copilot. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(4942, "Retry"))
+                    primaryButton: ( localize(5013, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstallWithRetry();
@@ -1428,8 +1253,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(4958, "What is your {0} instance?", defaultChat.enterpriseProviderName)),
-            placeHolder: ( localize(4959, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
+            prompt: ( localize(5027, "What is your {0} instance?", defaultChat.enterpriseProviderName)),
+            placeHolder: ( localize(5028, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async (value) => {
@@ -1440,14 +1265,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(4960, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(5029, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            4961,
+                            5030,
                             'You must enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")',
                             defaultChat.enterpriseProviderName
                         )),
@@ -1484,11 +1309,10 @@ ChatSetupController = ( __decorate([
     ( __param(7, IProgressService)),
     ( __param(8, IActivityService)),
     ( __param(9, ICommandService)),
-    ( __param(10, IWorkspaceTrustRequestService)),
-    ( __param(11, IDialogService)),
-    ( __param(12, IConfigurationService)),
-    ( __param(13, ILifecycleService)),
-    ( __param(14, IQuickInputService))
+    ( __param(10, IDialogService)),
+    ( __param(11, IConfigurationService)),
+    ( __param(12, ILifecycleService)),
+    ( __param(13, IQuickInputService))
 ], ChatSetupController));
 function refreshTokens(commandService) {
     commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);