@codingame/monaco-vscode-chat-service-override 17.2.0 → 18.0.0

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

@@ -3,7 +3,7 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatSetup from './media/chatSetup.css';
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { Dialog } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/base/browser/ui/dialog/dialog';
+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';
@@ -19,14 +19,13 @@ import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 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 { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+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 { 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';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/platform/dialogs/browser/dialog';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -45,7 +44,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { 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-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity';
+import { ProgressBadge } from '@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-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';
@@ -55,21 +54,26 @@ import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
+import { ChatEntitlement, ChatEntitlementRequests, isProUser } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-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 { 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 { 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { showCopilotView, ChatViewId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+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 { 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 { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 
 var SetupAgent_1, ChatSetup_1;
 registerCss(chatSetup);
@@ -77,15 +81,16 @@ const defaultChat = {
     extensionId: product.defaultChatAgent?.extensionId ?? '',
     chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
     documentationUrl: product.defaultChatAgent?.documentationUrl ?? '',
-    termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
-    privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
     skusDocumentationUrl: product.defaultChatAgent?.skusDocumentationUrl ?? '',
     publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
     manageOveragesUrl: product.defaultChatAgent?.manageOverageUrl ?? '',
     upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
+    signUpUrl: product.defaultChatAgent?.signUpUrl ?? '',
     providerName: product.defaultChatAgent?.providerName ?? '',
     enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
     enterpriseProviderName: product.defaultChatAgent?.enterpriseProviderName ?? '',
+    alternativeProviderId: product.defaultChatAgent?.alternativeProviderId ?? '',
+    alternativeProviderName: product.defaultChatAgent?.alternativeProviderName ?? '',
     providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? '',
     providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
     manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
@@ -94,12 +99,6 @@ const defaultChat = {
     completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
     chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
 };
-const copilotSettingsMessage = ( localize(
-    4850,
-    "Copilot Free and Pro may show [public code]({0}) suggestions and we may use your data for product improvement. You can change these [settings]({1}) at any time.",
-    defaultChat.publicCodeMatchesUrl,
-    defaultChat.manageSettingsUrl
-));
 const ToolsAgentContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentEnabled}`, true)), ( ChatContextKeys.Editing.agentModeDisallowed.negate()),
 ContextKeyExpr.not(`previewFeaturesDisabled`)));
 let SetupAgent = class SetupAgent extends Disposable {
@@ -108,7 +107,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         return instantiationService.invokeFunction(accessor => {
             const chatAgentService = accessor.get(IChatAgentService);
             let id;
-            let description = ( localize(4851, "Ask Copilot"));
+            let description = ChatMode2.Ask.description;
             switch (location) {
                 case ChatAgentLocation.Panel:
                     if (mode === ChatMode.Ask) {
@@ -116,11 +115,11 @@ let SetupAgent = class SetupAgent extends Disposable {
                     }
                     else if (mode === ChatMode.Edit) {
                         id = 'setup.edits';
-                        description = ( localize(4852, "Edit files in your workspace"));
+                        description = ChatMode2.Edit.description;
                     }
                     else {
                         id = 'setup.agent';
-                        description = ( localize(4853, "Edit files in your workspace in agent mode"));
+                        description = ChatMode2.Agent.description;
                     }
                     break;
                 case ChatAgentLocation.Terminal:
@@ -140,21 +139,18 @@ 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(4854, "Ask questions about VS Code")).value, ChatAgentLocation.Panel, undefined, context, controller);
+            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);
             disposables.add(disposable);
             disposables.add(SetupTool.registerTool(instantiationService, {
                 id: 'setup.tools.createNewWorkspace',
-                source: {
-                    type: 'internal',
-                },
+                source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(4855, "New Workspace")),
-                modelDescription: ( localize(4856, "Scaffold a new workspace in VS Code")),
-                userDescription: ( localize(4856, "Scaffold a new workspace in VS Code")),
+                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")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: 'new',
                 when: ContextKeyExpr.true(),
-                supportsToolPicker: true,
             }).disposable);
             return { agent, disposable: disposables };
         });
@@ -179,10 +175,13 @@ 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) {
+            chatAgentService.updateAgent(id, { themeIcon: Codicon.tools });
+        }
         return { agent, disposable: disposables };
     }
-    static { this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(4857, "You need to set up Copilot to use Chat.")))); }
-    constructor(context, controller, location, instantiationService, logService, configurationService, telemetryService) {
+    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) {
         super();
         this.context = context;
         this.controller = controller;
@@ -191,6 +190,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         this.logService = logService;
         this.configurationService = configurationService;
         this.telemetryService = telemetryService;
+        this.environmentService = environmentService;
         this._onUnresolvableError = this._register(( new Emitter()));
         this.onUnresolvableError = this._onUnresolvableError.event;
         this.pendingForwardedRequests = ( new Map());
@@ -202,11 +202,11 @@ let SetupAgent = class SetupAgent extends Disposable {
             const chatWidgetService = accessor.get(IChatWidgetService);
             const chatAgentService = accessor.get(IChatAgentService);
             const languageModelToolsService = accessor.get(ILanguageModelToolsService);
-            return this.doInvoke(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
+            return this.doInvoke(request, part => progress([part]), chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
         });
     }
     async doInvoke(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService) {
-        if (!this.context.state.installed || this.context.state.entitlement === ChatEntitlement.Available || this.context.state.entitlement === ChatEntitlement.Unknown) {
+        if (!this.context.state.installed || this.context.state.disabled || 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 +219,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: 'progressMessage',
-            content: ( new MarkdownString(( localize(4858, "Getting Copilot ready.")))),
+            content: ( new MarkdownString(( localize(4903, "Getting Copilot ready.")))),
         });
         await this.forwardRequestToCopilot(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
         return {};
@@ -231,7 +231,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         catch (error) {
             progress({
                 kind: 'warning',
-                content: ( new MarkdownString(( localize(4859, "Copilot failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(4904, "Copilot failed to get a response. Please try again."))))
             });
         }
     }
@@ -259,27 +259,36 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: 'progressMessage',
-                    content: ( new MarkdownString(( localize(4860, "Copilot is almost ready.")))),
+                    content: ( new MarkdownString(( localize(4905, "Copilot is almost ready.")))),
                 });
             }, 10000);
             try {
                 const ready = await Promise.race([
-                    timeout(20000).then(() => 'timedout'),
+                    timeout(this.environmentService.remoteAuthority ? 60000  : 20000).then(() => 'timedout'),
                     this.whenDefaultAgentFailed(chatService).then(() => 'error'),
                     Promise.allSettled([whenLanguageModelReady, whenAgentReady, whenToolsModelReady])
                 ]);
                 if (ready === 'error' || ready === 'timedout') {
+                    let warningMessage;
+                    if (ready === 'timedout') {
+                        warningMessage = ( localize(
+                            4906,
+                            "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
+                        ));
+                    }
+                    else {
+                        warningMessage = ( localize(
+                            4907,
+                            "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
+                        ));
+                    }
                     progress({
                         kind: 'warning',
-                        content: ( new MarkdownString(ready === 'timedout' ?
-                            ( localize(
-                            4861,
-                            "Copilot took too long to get ready. Please review the guidance in the Chat view."
-                        )) :
-                            ( localize(
-                            4862,
-                            "Copilot failed to get ready. Please review the guidance in the Chat view."
-                        ))))
+                        content: ( new MarkdownString(warningMessage))
                     });
                     this._onUnresolvableError.fire();
                     return;
@@ -289,7 +298,11 @@ let SetupAgent = class SetupAgent extends Disposable {
                 clearTimeout(timeoutHandle);
             }
         }
-        await chatService.resendRequest(requestModel, { mode, userSelectedModelId: languageModel });
+        await chatService.resendRequest(requestModel, {
+            mode,
+            userSelectedModelId: languageModel,
+            userSelectedTools: widget?.getUserSelectedTools()
+        });
     }
     whenLanguageModelReady(languageModelsService) {
         for (const id of languageModelsService.getLanguageModelIds()) {
@@ -343,7 +356,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                     progress({
                         kind: 'progressMessage',
                         content: ( new MarkdownString(( localize(
-                            4863,
+                            4908,
                             "Signing in to {0}.",
                             ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
                         )))),
@@ -352,14 +365,14 @@ let SetupAgent = class SetupAgent extends Disposable {
                 case ChatSetupStep.Installing:
                     progress({
                         kind: 'progressMessage',
-                        content: ( new MarkdownString(( localize(4864, "Getting Copilot ready.")))),
+                        content: ( new MarkdownString(( localize(4909, "Getting Copilot ready.")))),
                     });
                     break;
             }
         }));
         let result = undefined;
         try {
-            result = await ChatSetup.getInstance(this.instantiationService, this.context, this.controller).run();
+            result = await ChatSetup.getInstance(this.instantiationService, this.context, this.controller).run({ disableChatViewReveal: true  });
         }
         catch (error) {
             this.logService.error(`[chat setup] Error during setup: ${toErrorMessage(error)}`);
@@ -372,7 +385,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 if (result.dialogSkipped) {
                     progress({
                         kind: 'markdownContent',
-                        content: ( new MarkdownString([( localize(4865, "Copilot setup finished successfully.")), copilotSettingsMessage].join('\n\n')))
+                        content: ( new MarkdownString(( localize(4910, "Copilot setup finished successfully."))))
                     });
                 }
                 else if (requestModel) {
@@ -384,7 +397,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             else {
                 progress({
                     kind: 'warning',
-                    content: ( new MarkdownString(( localize(4866, "Copilot setup failed."))))
+                    content: ( new MarkdownString(( localize(4911, "Copilot setup failed."))))
                 });
             }
         }
@@ -476,7 +489,8 @@ SetupAgent = SetupAgent_1 = ( __decorate([
     ( __param(3, IInstantiationService)),
     ( __param(4, ILogService)),
     ( __param(5, IConfigurationService)),
-    ( __param(6, ITelemetryService))
+    ( __param(6, ITelemetryService)),
+    ( __param(7, IWorkbenchEnvironmentService))
 ], SetupAgent));
 class SetupTool extends Disposable {
     static registerTool(instantiationService, toolData) {
@@ -510,6 +524,7 @@ var ChatSetupStrategy;
     ChatSetupStrategy[ChatSetupStrategy["DefaultSetup"] = 1] = "DefaultSetup";
     ChatSetupStrategy[ChatSetupStrategy["SetupWithoutEnterpriseProvider"] = 2] = "SetupWithoutEnterpriseProvider";
     ChatSetupStrategy[ChatSetupStrategy["SetupWithEnterpriseProvider"] = 3] = "SetupWithEnterpriseProvider";
+    ChatSetupStrategy[ChatSetupStrategy["SetupWithAccountCreate"] = 4] = "SetupWithAccountCreate";
 })(ChatSetupStrategy || (ChatSetupStrategy = {}));
 let ChatSetup = class ChatSetup {
     static { ChatSetup_1 = this; }
@@ -523,39 +538,45 @@ let ChatSetup = class ChatSetup {
                     controller,
                     instantiationService,
                     accessor.get(ITelemetryService),
-                    accessor.get(IContextMenuService),
                     accessor.get(IWorkbenchLayoutService),
                     accessor.get(IKeybindingService),
                     accessor.get(IChatEntitlementService),
                     accessor.get(ILogService),
-                    accessor.get(IConfigurationService)
+                    accessor.get(IConfigurationService),
+                    accessor.get(IViewsService),
+                    accessor.get(IProductService),
+                    accessor.get(IOpenerService),
+                    accessor.get(IContextMenuService)
                 ));
             });
         }
         return instance;
     }
-    constructor(context, controller, instantiationService, telemetryService, contextMenuService, layoutService, keybindingService, chatEntitlementService, logService, configurationService) {
+    constructor(context, controller, instantiationService, telemetryService, layoutService, keybindingService, chatEntitlementService, logService, configurationService, viewsService, productService, openerService, contextMenuService) {
         this.context = context;
         this.controller = controller;
         this.instantiationService = instantiationService;
         this.telemetryService = telemetryService;
-        this.contextMenuService = contextMenuService;
         this.layoutService = layoutService;
         this.keybindingService = keybindingService;
         this.chatEntitlementService = chatEntitlementService;
         this.logService = logService;
         this.configurationService = configurationService;
+        this.viewsService = viewsService;
+        this.productService = productService;
+        this.openerService = openerService;
+        this.contextMenuService = contextMenuService;
         this.pendingRun = undefined;
         this.skipDialogOnce = false;
     }
     skipDialog() {
         this.skipDialogOnce = true;
     }
-    async run() {
+    async run(options) {
         if (this.pendingRun) {
             return this.pendingRun;
         }
-        this.pendingRun = this.doRun();
+        this.pendingRun = this.doRun(options);
         try {
             return await this.pendingRun;
         }
@@ -563,11 +584,12 @@ let ChatSetup = class ChatSetup {
             this.pendingRun = undefined;
         }
     }
-    async doRun() {
+    async doRun(options) {
+        this.context.update({ later: false });
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         let setupStrategy;
-        if (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
+        if (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free) {
             setupStrategy = ChatSetupStrategy.DefaultSetup;
         }
         else {
@@ -576,6 +598,9 @@ let ChatSetup = class ChatSetup {
         if (setupStrategy === ChatSetupStrategy.DefaultSetup && ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
             setupStrategy = ChatSetupStrategy.SetupWithEnterpriseProvider;
         }
+        if (setupStrategy !== ChatSetupStrategy.Canceled && !options?.disableChatViewReveal) {
+            showCopilotView(this.viewsService, this.layoutService);
+        }
         let success = undefined;
         try {
             switch (setupStrategy) {
@@ -588,7 +613,11 @@ let ChatSetup = class ChatSetup {
                 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 });
                     break;
             }
@@ -600,24 +629,207 @@ 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 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 { 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;
+            }
+        }
+        else {
+            buttons = [[( localize(4919, "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') }]);
+        return buttons;
+    }
+    getDialogTitle(variant) {
+        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");
+        }
+    }
+    createDialogFooter(disposables) {
+        const element = $('.chat-setup-dialog-footer');
+        const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
+        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', 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.getPrimaryButton(), ( localize(4867, "Maybe Later"))];
+        const buttons = [this.getLegacyPrimaryButton(), ( localize(4928, "Maybe Later"))];
         const dialog = disposables.add(( new Dialog(
             this.layoutService.activeContainer,
-            this.getDialogTitle(),
+            this.getLegacyDialogTitle(),
             buttons,
             createWorkbenchDialogOptions({
                 type: 'none',
                 icon: Codicon.copilotLarge,
                 cancelId: buttons.length - 1,
-                renderBody: body => body.appendChild(this.createDialog(disposables)),
+                renderBody: body => body.appendChild(this.createLegacyDialog(disposables)),
                 primaryButtonDropdown: {
                     contextMenuProvider: this.contextMenuService,
                     addPrimaryActionToDropdown: false,
                     actions: [
-                        toAction({ id: 'setupWithProvider', label: ( localize(4868, "Sign in with a {0} Account", defaultChat.providerName)), run: () => result = ChatSetupStrategy.SetupWithoutEnterpriseProvider }),
-                        toAction({ id: 'setupWithEnterpriseProvider', label: ( localize(4869, "Sign in with a {0} Account", defaultChat.enterpriseProviderName)), run: () => result = ChatSetupStrategy.SetupWithEnterpriseProvider }),
+                        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)
@@ -626,39 +838,41 @@ let ChatSetup = class ChatSetup {
         disposables.dispose();
         return button === 0 ? result ?? ChatSetupStrategy.DefaultSetup : ChatSetupStrategy.Canceled;
     }
-    getPrimaryButton() {
+    getLegacyPrimaryButton() {
         if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            return localize(4870, "Sign in");
+            if (ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
+                return localize(4931, "Sign in with {0}", defaultChat.enterpriseProviderName);
+            }
+            return localize(4932, "Sign in");
         }
-        return localize(4871, "Use Copilot");
+        return localize(4933, "Use Copilot");
     }
-    getDialogTitle() {
+    getLegacyDialogTitle() {
         if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-            return this.context.state.registered ? ( localize(4872, "Sign in to use Copilot")) : ( localize(4873, "Sign in to use Copilot for free"));
+            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(4874, "Start using Copilot Pro");
+            return localize(4936, "Start using Copilot Pro");
         }
-        return this.context.state.registered ? ( localize(4875, "Start using Copilot")) : ( localize(4876, "Start using Copilot for free"));
+        return this.context.state.registered ? ( localize(4937, "Start using Copilot")) : ( localize(4938, "Start using Copilot for free"));
     }
-    createDialog(disposables) {
-        const element = $('.chat-setup-dialog');
+    createLegacyDialog(disposables) {
+        const element = $('.chat-setup-dialog-legacy');
         const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
         const header = ( localize(
-            4877,
+            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));
-        const terms = ( localize(
-            4878,
-            "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).",
-            defaultChat.termsStatementUrl,
-            defaultChat.privacyStatementUrl
-        ));
-        element.appendChild($('p.setup-legal', undefined, disposables.add(markdown.render(( new MarkdownString(terms, { isTrusted: true })))).element));
         if (this.telemetryService.telemetryLevel !== TelemetryLevel.NONE) {
-            const settings = copilotSettingsMessage;
+            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;
@@ -667,12 +881,15 @@ let ChatSetup = class ChatSetup {
 ChatSetup = ChatSetup_1 = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, ITelemetryService)),
-    ( __param(4, IContextMenuService)),
-    ( __param(5, ILayoutService)),
-    ( __param(6, IKeybindingService)),
-    ( __param(7, IChatEntitlementService)),
-    ( __param(8, ILogService)),
-    ( __param(9, IConfigurationService))
+    ( __param(4, ILayoutService)),
+    ( __param(5, IKeybindingService)),
+    ( __param(6, IChatEntitlementService)),
+    ( __param(7, ILogService)),
+    ( __param(8, IConfigurationService)),
+    ( __param(9, IViewsService)),
+    ( __param(10, IProductService)),
+    ( __param(11, IOpenerService)),
+    ( __param(12, IContextMenuService))
 ], ChatSetup));
 let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatSetup'; }
@@ -693,14 +910,14 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         ));
         this.registerSetupAgents(context, controller);
         this.registerActions(context, requests, controller);
+        this.registerMenus();
         this.registerUrlLinkHandler();
     }
     registerSetupAgents(context, controller) {
         const defaultAgentDisposables = markAsSingleton(( new MutableDisposable()));
         const vscodeAgentDisposables = markAsSingleton(( new MutableDisposable()));
         const updateRegistration = () => {
-            const disabled = context.state.hidden  || context.state.disabled ;
-            if (!disabled) {
+            if (!context.state.hidden && !context.state.disabled) {
                 if (!defaultAgentDisposables.value) {
                     const disposables = defaultAgentDisposables.value = ( new DisposableStore());
                     const panelAgentDisposables = disposables.add(( new DisposableStore()));
@@ -716,7 +933,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Notebook, undefined, context, controller).disposable);
                     disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Editor, undefined, context, controller).disposable);
                 }
-                if (!context.state.installed && !vscodeAgentDisposables.value) {
+                if (!(context.state.installed && !context.state.disabled) && !vscodeAgentDisposables.value) {
                     const disposables = vscodeAgentDisposables.value = ( new DisposableStore());
                     disposables.add(SetupAgent.registerVSCodeAgent(this.instantiationService, context, controller).disposable);
                 }
@@ -725,7 +942,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 defaultAgentDisposables.clear();
                 vscodeAgentDisposables.clear();
             }
-            if (context.state.installed) {
+            if (context.state.installed && !context.state.disabled) {
                 vscodeAgentDisposables.clear();
             }
         };
@@ -733,7 +950,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(4879, "Use AI Features with Copilot for free..."));
+        const CHAT_SETUP_ACTION_LABEL = ( localize2(4940, "Use AI Features with Copilot for free..."));
         class ChatSetupTriggerAction extends Action2 {
             constructor() {
                 super({
@@ -752,9 +969,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const commandService = accessor.get(ICommandService);
                 const lifecycleService = accessor.get(ILifecycleService);
                 await context.update({ hidden: false });
-                const chatWidgetPromise = showCopilotView(viewsService, layoutService);
                 if (mode) {
-                    const chatWidget = await chatWidgetPromise;
+                    const chatWidget = await showCopilotView(viewsService, layoutService);
                     chatWidget?.input.setChatMode(mode);
                 }
                 const setup = ChatSetup.getInstance(instantiationService, context, controller);
@@ -762,13 +978,14 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 if (success === false && !lifecycleService.willShutdown) {
                     const { confirmed } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(4880, "Copilot setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(4881, "Retry")),
+                        message: ( localize(4941, "Copilot setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(4942, "Retry")),
                     });
                     if (confirmed) {
-                        commandService.executeCommand(CHAT_SETUP_ACTION_ID);
+                        return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID));
                     }
                 }
+                return Boolean(success);
             }
         }
         class ChatSetupTriggerWithoutDialogAction extends Action2 {
@@ -786,14 +1003,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(4882, "Set up Copilot.")));
+                chatWidget?.acceptInput(( localize(4943, "Set up Copilot.")));
             }
         }
         class ChatSetupFromAccountsAction extends Action2 {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupFromAccounts',
-                    title: ( localize2(4883, "Sign in to use Copilot...")),
+                    title: ( localize2(4944, "Sign in to use Copilot...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: '2_copilot',
@@ -810,7 +1027,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         }
         class ChatSetupHideAction extends Action2 {
             static { this.ID = 'workbench.action.chat.hideSetup'; }
-            static { this.TITLE = ( localize2(4884, "Hide Copilot")); }
+            static { this.TITLE = ( localize2(4945, "Hide Copilot")); }
             constructor() {
                 super({
                     id: ChatSetupHideAction.ID,
@@ -831,13 +1048,13 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const layoutService = accessor.get(IWorkbenchLayoutService);
                 const dialogService = accessor.get(IDialogService);
                 const { confirmed } = await dialogService.confirm({
-                    message: ( localize(4885, "Are you sure you want to hide Copilot?")),
+                    message: ( localize(4946, "Are you sure you want to hide Copilot?")),
                     detail: ( localize(
-                        4886,
+                        4947,
                         "You can restore Copilot by running the '{0}' command.",
                         CHAT_SETUP_ACTION_LABEL.value
                     )),
-                    primaryButton: ( localize(4887, "Hide Copilot"))
+                    primaryButton: ( localize(4948, "Hide Copilot"))
                 });
                 if (!confirmed) {
                     return;
@@ -857,15 +1074,15 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.upgradePlan',
-                    title: ( localize2(4888, "Upgrade to Copilot Pro")),
-                    category: ( localize2(4889, 'Chat')),
+                    title: ( localize2(4949, "Upgrade to Copilot Pro")),
+                    category: ( localize2(4950, 'Chat')),
                     f1: true,
-                    precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.canSignUp, ChatContextKeys.Entitlement.limited)),
+                    precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.canSignUp, ChatContextKeys.Entitlement.free)),
                     menu: {
                         id: MenuId.ChatTitleBarMenu,
                         group: 'a_first',
                         order: 1,
-                        when: ( ContextKeyExpr.and(ChatContextKeys.Entitlement.limited, ( ContextKeyExpr.or(
+                        when: ( ContextKeyExpr.and(ChatContextKeys.Entitlement.free, ( ContextKeyExpr.or(
                             ChatContextKeys.chatQuotaExceeded,
                             ChatContextKeys.completionsQuotaExceeded
                         ))))
@@ -896,8 +1113,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.manageOverages',
-                    title: ( localize2(4890, "Manage Copilot Overages")),
-                    category: ( localize2(4889, 'Chat')),
+                    title: ( localize2(4951, "Manage Copilot Overages")),
+                    category: ( localize2(4950, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.pro, ChatContextKeys.Entitlement.proPlus)),
                     menu: {
@@ -923,6 +1140,28 @@ 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 => {
@@ -987,7 +1226,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(4891, "Getting Copilot ready..."));
+        const title = ( localize(4953, "Getting Copilot ready..."));
         const badge = this.activityService.showViewContainerActivity(CHAT_SIDEBAR_PANEL_ID, {
             badge: ( new ProgressBadge(() => title)),
         });
@@ -1013,14 +1252,15 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 this.setStep(ChatSetupStep.SigningIn);
                 const result = await this.signIn(providerId);
                 if (!result.session) {
+                    this.doInstall();
                     this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined });
-                    return false;
+                    return undefined;
                 }
                 session = result.session;
                 entitlement = result.entitlement;
             }
             const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-                message: ( localize(4892, "Copilot is currently only supported in trusted workspaces."))
+                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 });
@@ -1048,12 +1288,12 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    4893,
+                    4955,
                     "Failed to sign in to {0}. Would you like to try again?",
                     ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
                 )),
-                detail: ( localize(4894, "You must be signed in to use Copilot.")),
-                primaryButton: ( localize(4881, "Retry"))
+                detail: ( localize(4956, "You must be signed in to use Copilot.")),
+                primaryButton: ( localize(4942, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(providerId);
@@ -1062,10 +1302,10 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         return { session, entitlement: entitlements?.entitlement };
     }
     async install(session, entitlement, providerId, watch) {
-        const wasInstalled = this.context.state.installed;
+        const wasRunning = this.context.state.installed && !this.context.state.disabled;
         let signUpResult = undefined;
         try {
-            if (entitlement !== ChatEntitlement.Limited &&
+            if (entitlement !== ChatEntitlement.Free &&
                 !isProUser(entitlement) &&
                 entitlement !== ChatEntitlement.Unavailable
             ) {
@@ -1080,12 +1320,12 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                         return false;
                     }
                 }
-                signUpResult = await this.requests.signUpLimited(session);
+                signUpResult = await this.requests.signUpFree(session);
                 if (typeof signUpResult !== 'boolean' ) {
                     this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode });
                 }
             }
-            await this.doInstall();
+            await this.doInstallWithRetry();
         }
         catch (error) {
             this.logService.error(`[chat setup] install: error ${error}`);
@@ -1093,23 +1333,17 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             return false;
         }
         if (typeof signUpResult === 'boolean') {
-            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: wasInstalled && !signUpResult ? 'alreadyInstalled' : 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined });
+            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: wasRunning && !signUpResult ? 'alreadyInstalled' : 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined });
         }
-        if (wasInstalled && signUpResult === true) {
+        if (wasRunning && signUpResult === true) {
             refreshTokens(this.commandService);
         }
         return true;
     }
-    async doInstall() {
+    async doInstallWithRetry() {
         let error;
         try {
-            await this.extensionsWorkbenchService.install(defaultChat.extensionId, {
-                enable: true,
-                isApplicationScoped: true,
-                isMachineScoped: false,
-                installEverywhere: true,
-                installPreReleaseVersion: this.productService.quality !== 'stable'
-            }, ChatViewId);
+            await this.doInstall();
         }
         catch (e) {
             this.logService.error(`[chat setup] install: error ${error}`);
@@ -1120,19 +1354,28 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 const { confirmed } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        4895,
+                        4957,
                         "An error occurred while setting up Copilot. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(4881, "Retry"))
+                    primaryButton: ( localize(4942, "Retry"))
                 });
                 if (confirmed) {
-                    return this.doInstall();
+                    return this.doInstallWithRetry();
                 }
             }
             throw error;
         }
     }
+    async doInstall() {
+        await this.extensionsWorkbenchService.install(defaultChat.extensionId, {
+            enable: true,
+            isApplicationScoped: true,
+            isMachineScoped: false,
+            installEverywhere: true,
+            installPreReleaseVersion: this.productService.quality !== 'stable'
+        }, ChatViewId);
+    }
     async setupWithProvider(options) {
         const registry = ( Registry.as(Extensions.Configuration));
         registry.registerConfiguration({
@@ -1155,7 +1398,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         if (options.useEnterpriseProvider) {
             const success = await this.handleEnterpriseInstance();
             if (!success) {
-                return false;
+                return success;
             }
         }
         let existingAdvancedSetting = this.configurationService.inspect(defaultChat.completionsAdvancedSetting).user?.value;
@@ -1173,7 +1416,6 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 ...existingAdvancedSetting,
                 'authProvider': undefined
             } : undefined, ConfigurationTarget.USER);
-            await this.configurationService.updateValue(defaultChat.providerUriSetting, undefined, ConfigurationTarget.USER);
         }
         return this.setup({ ...options, forceSignIn: true });
     }
@@ -1186,8 +1428,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(4896, "What is your {0} instance?", defaultChat.enterpriseProviderName)),
-            placeHolder: ( localize(4897, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
+            prompt: ( localize(4958, "What is your {0} instance?", defaultChat.enterpriseProviderName)),
+            placeHolder: ( localize(4959, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async (value) => {
@@ -1198,14 +1440,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(4898, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(4960, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            4899,
+                            4961,
                             'You must enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")',
                             defaultChat.enterpriseProviderName
                         )),
@@ -1216,19 +1458,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             }
         });
         if (!result) {
-            const { confirmed } = await this.dialogService.confirm({
-                type: Severity.Error,
-                message: ( localize(
-                    4900,
-                    "The provided {0} instance is invalid. Would you like to enter it again?",
-                    defaultChat.enterpriseProviderName
-                )),
-                primaryButton: ( localize(4881, "Retry"))
-            });
-            if (confirmed) {
-                return this.handleEnterpriseInstance();
-            }
-            return false;
+            return undefined;
         }
         let resolvedUri = result;
         if (isSingleWord) {