@codingame/monaco-vscode-chat-service-override 14.0.6 → 15.0.0

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

@@ -14,7 +14,7 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { 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 { 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';
@@ -45,17 +45,17 @@ import { ProgressBadge } from '@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { IAuthenticationService, IAuthenticationExtensionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
-import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Parts } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.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 { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { showCopilotView, ensureSideBarChatViewSize, ChatViewId, preferCopilotEditsView, EditsViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
-import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
-import { IChatQuotasService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatQuotasService.service';
+import { CHAT_CATEGORY, CHAT_SETUP_ACTION_LABEL, CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { showCopilotView, ensureSideBarChatViewSize, ChatViewId, preferCopilotEditsView, EditsViewId } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatViewPane';
+import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
+import { IChatQuotasService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatQuotasService.service';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -72,6 +72,9 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
+import { ChatEntitlement } from '../common/chatEntitlementsService.js';
+import { IChatEntitlementsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementsService.service';
+import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
 var ChatSetupRequests_1, ChatSetupContext_1;
 const defaultChat = {
@@ -94,34 +97,44 @@ const defaultChat = {
     entitlementSignupLimitedUrl: product.defaultChatAgent?.entitlementSignupLimitedUrl ?? '',
     manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
 };
-var ChatEntitlement;
-(function (ChatEntitlement) {
-    ChatEntitlement[ChatEntitlement["Unknown"] = 1] = "Unknown";
-    ChatEntitlement[ChatEntitlement["Unresolved"] = 2] = "Unresolved";
-    ChatEntitlement[ChatEntitlement["Available"] = 3] = "Available";
-    ChatEntitlement[ChatEntitlement["Unavailable"] = 4] = "Unavailable";
-    ChatEntitlement[ChatEntitlement["Limited"] = 5] = "Limited";
-    ChatEntitlement[ChatEntitlement["Pro"] = 6] = "Pro";
-})(ChatEntitlement || (ChatEntitlement = {}));
-const TRIGGER_SETUP_COMMAND_ID = 'workbench.action.chat.triggerSetup';
-const TRIGGER_SETUP_COMMAND_LABEL = ( localize2(4636, "Use AI Features with Copilot for Free..."));
+let ChatEntitlementsService = class ChatEntitlementsService extends Disposable {
+    constructor(instantiationService, productService, environmentService) {
+        super();
+        if (!productService.defaultChatAgent ||
+            (isWeb && !environmentService.remoteAuthority)
+        ) {
+            return;
+        }
+        const context = this.context = ( new Lazy(
+            () => this._register(instantiationService.createInstance(ChatSetupContext))
+        ));
+        this.requests = ( new Lazy(
+            () => this._register(instantiationService.createInstance(ChatSetupRequests, context.value))
+        ));
+    }
+    async resolve(token) {
+        return this.requests?.value.forceResolveEntitlement(undefined, token);
+    }
+};
+ChatEntitlementsService = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IProductService)),
+    ( __param(2, IWorkbenchEnvironmentService))
+], ChatEntitlementsService));
 let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     static { this.ID = 'workbench.chat.setup'; }
-    constructor(productService, instantiationService, environmentService, commandService, telemetryService, experimentService) {
+    constructor(productService, instantiationService, commandService, telemetryService, experimentService, chatEntitlementsService) {
         super();
         this.productService = productService;
         this.instantiationService = instantiationService;
-        this.environmentService = environmentService;
         this.commandService = commandService;
         this.telemetryService = telemetryService;
         this.experimentService = experimentService;
-        if (!this.productService.defaultChatAgent ||
-            (isWeb && !this.environmentService.remoteAuthority)
-        ) {
+        const context = chatEntitlementsService.context?.value;
+        const requests = chatEntitlementsService.requests?.value;
+        if (!context || !requests) {
             return;
         }
-        const context = this._register(this.instantiationService.createInstance(ChatSetupContext));
-        const requests = this._register(this.instantiationService.createInstance(ChatSetupRequests, context));
         const controller = ( new Lazy(
             () => this._register(this.instantiationService.createInstance(ChatSetupController, context, requests))
         ));
@@ -132,7 +145,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     }
     registerChatWelcome(controller, context) {
         ( Registry.as(ChatViewsWelcomeExtensions.ChatViewsWelcomeRegistry)).register({
-            title: ( localize(4637, "Welcome to Copilot")),
+            title: ( localize(4672, "Welcome to Copilot")),
             when: ChatContextKeys.SetupViewCondition,
             icon: Codicon.copilotLarge,
             content: disposables => disposables.add(this.instantiationService.createInstance(ChatSetupWelcomeContent, controller.value, context)).element,
@@ -143,13 +156,13 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         class ChatSetupTriggerAction extends Action2 {
             constructor() {
                 super({
-                    id: TRIGGER_SETUP_COMMAND_ID,
-                    title: TRIGGER_SETUP_COMMAND_LABEL,
+                    id: CHAT_SETUP_ACTION_ID,
+                    title: CHAT_SETUP_ACTION_LABEL,
                     category: CHAT_CATEGORY,
                     f1: true,
                     precondition: chatSetupTriggerContext,
                     menu: {
-                        id: MenuId.ChatCommandCenter,
+                        id: MenuId.ChatTitleBarMenu,
                         group: 'a_last',
                         order: 1,
                         when: chatSetupTriggerContext
@@ -161,15 +174,17 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const viewDescriptorService = accessor.get(IViewDescriptorService);
                 const configurationService = accessor.get(IConfigurationService);
                 const layoutService = accessor.get(IWorkbenchLayoutService);
+                const statusbarService = accessor.get(IStatusbarService);
                 await context.update({ hidden: false });
                 showCopilotView(viewsService, layoutService);
                 ensureSideBarChatViewSize(viewDescriptorService, layoutService, viewsService);
+                statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
                 configurationService.updateValue('chat.commandCenter.enabled', true);
             }
         }
         class ChatSetupHideAction extends Action2 {
             static { this.ID = 'workbench.action.chat.hideSetup'; }
-            static { this.TITLE = ( localize2(4638, "Hide Copilot")); }
+            static { this.TITLE = ( localize2(4673, "Hide Copilot")); }
             constructor() {
                 super({
                     id: ChatSetupHideAction.ID,
@@ -178,7 +193,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     category: CHAT_CATEGORY,
                     precondition: ( ChatContextKeys.Setup.installed.negate()),
                     menu: {
-                        id: MenuId.ChatCommandCenter,
+                        id: MenuId.ChatTitleBarMenu,
                         group: 'z_hide',
                         order: 1,
                         when: ( ChatContextKeys.Setup.installed.negate())
@@ -190,19 +205,28 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const layoutService = accessor.get(IWorkbenchLayoutService);
                 const configurationService = accessor.get(IConfigurationService);
                 const dialogService = accessor.get(IDialogService);
+                const statusbarService = accessor.get(IStatusbarService);
                 const { confirmed } = await dialogService.confirm({
-                    message: ( localize(4639, "Are you sure you want to hide Copilot?")),
+                    message: ( localize(4674, "Are you sure you want to hide Copilot?")),
                     detail: ( localize(
-                        4640,
+                        4675,
                         "You can restore Copilot by running the '{0}' command.",
-                        TRIGGER_SETUP_COMMAND_LABEL.value
+                        CHAT_SETUP_ACTION_LABEL.value
                     )),
-                    primaryButton: ( localize(4641, "Hide Copilot"))
+                    primaryButton: ( localize(4676, "Hide Copilot"))
                 });
                 if (!confirmed) {
                     return;
                 }
-                await hideSetupView(viewsDescriptorService, layoutService);
+                const location = viewsDescriptorService.getViewLocationById(ChatViewId);
+                await context.update({ hidden: true });
+                if (location === ViewContainerLocation.AuxiliaryBar) {
+                    const activeContainers = viewsDescriptorService.getViewContainersByLocation(location).filter(container => viewsDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0);
+                    if (activeContainers.length === 0) {
+                        layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART);
+                    }
+                }
+                statusbarService.updateEntryVisibility('chat.statusBarEntry', false);
                 configurationService.updateValue('chat.commandCenter.enabled', false);
             }
         }
@@ -211,12 +235,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.upgradePlan',
-                    title: ( localize2(4642, "Upgrade to Copilot Pro")),
-                    category: ( localize2(4643, 'Chat')),
+                    title: ( localize2(4677, "Upgrade to Copilot Pro")),
+                    category: ( localize2(4678, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.or(ChatContextKeys.Setup.canSignUp, ChatContextKeys.Setup.limited)),
                     menu: {
-                        id: MenuId.ChatCommandCenter,
+                        id: MenuId.ChatTitleBarMenu,
                         group: 'a_first',
                         order: 1,
                         when: ( ContextKeyExpr.or(
@@ -241,23 +265,13 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             async onWindowFocus(focus, commandService) {
                 if (focus) {
                     windowFocusListener.clear();
-                    const entitlement = await requests.forceResolveEntitlement(undefined);
-                    if (entitlement === ChatEntitlement.Pro) {
+                    const entitlements = await requests.forceResolveEntitlement(undefined);
+                    if (entitlements?.entitlement === ChatEntitlement.Pro) {
                         refreshTokens(commandService);
                     }
                 }
             }
         }
-        async function hideSetupView(viewsDescriptorService, layoutService) {
-            const location = viewsDescriptorService.getViewLocationById(ChatViewId);
-            await context.update({ hidden: true });
-            if (location === ViewContainerLocation.AuxiliaryBar) {
-                const activeContainers = viewsDescriptorService.getViewContainersByLocation(location).filter(container => viewsDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0);
-                if (activeContainers.length === 0) {
-                    layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART);
-                }
-            }
-        }
         registerAction2(ChatSetupTriggerAction);
         registerAction2(ChatSetupHideAction);
         registerAction2(UpgradePlanAction);
@@ -269,8 +283,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             },
             handleURL: async (url) => {
                 const params = ( new URLSearchParams(url.query));
-                this.telemetryService.publicLog2('workbenchActionExecuted', { id: TRIGGER_SETUP_COMMAND_ID, from: 'url', detail: params.get('referrer') ?? undefined });
-                await this.commandService.executeCommand(TRIGGER_SETUP_COMMAND_ID);
+                this.telemetryService.publicLog2('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'url', detail: params.get('referrer') ?? undefined });
+                await this.commandService.executeCommand(CHAT_SETUP_ACTION_ID);
                 return true;
             }
         }));
@@ -286,14 +300,14 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const defaultValue = value ?? (context.state.entitlement === ChatEntitlement.Limited ? 5 : 15);
                 const node = {
                     id: 'chatSidebar',
-                    title: ( localize(4644, "Chat")),
+                    title: ( localize(4679, "Chat")),
                     type: 'object',
                     properties: {
                         'chat.agent.maxRequests': {
                             type: 'number',
-                            description: ( localize(
-                                4645,
-                                "The maximum number of requests to allow Copilot Edits to use in agent mode."
+                            markdownDescription: ( localize(
+                                4680,
+                                "The maximum number of requests to allow Copilot Edits to use per-turn in agent mode. When the limit is reached, Copilot will ask the user to confirm that it should keep working. \n\n> **Note**: For users on the Copilot Free plan, note that each agent mode request currently uses one chat request."
                             )),
                             default: defaultValue,
                             tags: ['experimental']
@@ -310,10 +324,10 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
 ChatSetupContribution = ( __decorate([
     ( __param(0, IProductService)),
     ( __param(1, IInstantiationService)),
-    ( __param(2, IWorkbenchEnvironmentService)),
-    ( __param(3, ICommandService)),
-    ( __param(4, ITelemetryService)),
-    ( __param(5, IWorkbenchAssignmentService))
+    ( __param(2, ICommandService)),
+    ( __param(3, ITelemetryService)),
+    ( __param(4, IWorkbenchAssignmentService)),
+    ( __param(5, IChatEntitlementsService))
 ], ChatSetupContribution));
 let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Disposable {
     static providerId(configurationService) {
@@ -418,7 +432,7 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
             this.didResolveEntitlements = true;
             this.update(entitlements);
         }
-        return entitlements?.entitlement;
+        return entitlements;
     }
     async doResolveEntitlement(session, token) {
         if (ChatSetupRequests_1.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
@@ -478,8 +492,10 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
         const entitlements = {
             entitlement,
             quotas: {
-                chat: entitlementsResponse.limited_user_quotas?.chat,
-                completions: entitlementsResponse.limited_user_quotas?.completions,
+                chatTotal: entitlementsResponse.monthly_quotas?.chat,
+                completionsTotal: entitlementsResponse.monthly_quotas?.completions,
+                chatRemaining: entitlementsResponse.limited_user_quotas?.chat,
+                completionsRemaining: entitlementsResponse.limited_user_quotas?.completions,
                 resetDate: entitlementsResponse.limited_user_reset_date
             }
         };
@@ -515,20 +531,24 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
         this.context.update({ entitlement: this.state.entitlement });
         if (state.quotas) {
             this.chatQuotasService.acceptQuotas({
-                chatQuotaExceeded: typeof state.quotas.chat === 'number' ? state.quotas.chat <= 0 : false,
-                completionsQuotaExceeded: typeof state.quotas.completions === 'number' ? state.quotas.completions <= 0 : false,
-                quotaResetDate: state.quotas.resetDate ? ( new Date(state.quotas.resetDate)) : undefined
+                chatQuotaExceeded: typeof state.quotas.chatRemaining === 'number' ? state.quotas.chatRemaining <= 0 : false,
+                completionsQuotaExceeded: typeof state.quotas.completionsRemaining === 'number' ? state.quotas.completionsRemaining <= 0 : false,
+                quotaResetDate: state.quotas.resetDate ? ( new Date(state.quotas.resetDate)) : undefined,
+                chatTotal: state.quotas.chatTotal,
+                completionsTotal: state.quotas.completionsTotal,
+                chatRemaining: state.quotas.chatRemaining,
+                completionsRemaining: state.quotas.completionsRemaining
             });
         }
     }
-    async forceResolveEntitlement(session) {
+    async forceResolveEntitlement(session, token = CancellationToken.None) {
         if (!session) {
-            session = await this.findMatchingProviderSession(CancellationToken.None);
+            session = await this.findMatchingProviderSession(token);
         }
         if (!session) {
             return undefined;
         }
-        return this.resolveEntitlement(session, CancellationToken.None);
+        return this.resolveEntitlement(session, token);
     }
     async signUpLimited(session) {
         const body = {
@@ -537,7 +557,7 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
         };
         const response = await this.request(defaultChat.entitlementSignupLimitedUrl, 'POST', body, session, CancellationToken.None);
         if (!response) {
-            const retry = await this.onUnknownSignUpError(( localize(4646, "No response received.")), '[chat setup] sign-up: no response');
+            const retry = await this.onUnknownSignUpError(( localize(4681, "No response received.")), '[chat setup] sign-up: no response');
             return retry ? this.signUpLimited(session) : { errorCode: 1 };
         }
         if (response.res.statusCode && response.res.statusCode !== 200) {
@@ -555,7 +575,7 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
                 catch (error) {
                 }
             }
-            const retry = await this.onUnknownSignUpError(( localize(4647, "Unexpected status code {0}.", response.res.statusCode)), `[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
+            const retry = await this.onUnknownSignUpError(( localize(4682, "Unexpected status code {0}.", response.res.statusCode)), `[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
             return retry ? this.signUpLimited(session) : { errorCode: response.res.statusCode };
         }
         let responseText = null;
@@ -565,7 +585,7 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
         catch (error) {
         }
         if (!responseText) {
-            const retry = await this.onUnknownSignUpError(( localize(4648, "Response has no contents.")), '[chat setup] sign-up: response has no content');
+            const retry = await this.onUnknownSignUpError(( localize(4683, "Response has no contents.")), '[chat setup] sign-up: response has no content');
             return retry ? this.signUpLimited(session) : { errorCode: 2 };
         }
         let parsedResult = undefined;
@@ -574,7 +594,7 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
             this.logService.trace(`[chat setup] sign-up: response is ${responseText}`);
         }
         catch (err) {
-            const retry = await this.onUnknownSignUpError(( localize(4649, "Invalid response contents.")), `[chat setup] sign-up: error parsing response (${err})`);
+            const retry = await this.onUnknownSignUpError(( localize(4684, "Invalid response contents.")), `[chat setup] sign-up: error parsing response (${err})`);
             return retry ? this.signUpLimited(session) : { errorCode: 3 };
         }
         this.update({ entitlement: ChatEntitlement.Limited });
@@ -585,11 +605,11 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
         const { confirmed } = await this.dialogService.confirm({
             type: Severity.Error,
             message: ( localize(
-                4650,
+                4685,
                 "An error occurred while signing up for Copilot Free. Would you like to try again?"
             )),
             detail,
-            primaryButton: ( localize(4651, "Retry"))
+            primaryButton: ( localize(4686, "Retry"))
         });
         return confirmed;
     }
@@ -597,15 +617,15 @@ let ChatSetupRequests = ChatSetupRequests_1 = class ChatSetupRequests extends Di
         this.logService.error(logMessage);
         this.dialogService.prompt({
             type: Severity.Error,
-            message: ( localize(4652, "An error occurred while signing up for Copilot Free.")),
+            message: ( localize(4687, "An error occurred while signing up for Copilot Free.")),
             detail: logDetails,
             buttons: [
                 {
-                    label: ( localize(4653, "OK")),
+                    label: ( localize(4688, "OK")),
                     run: () => { }
                 },
                 {
-                    label: ( localize(4654, "Learn More")),
+                    label: ( localize(4689, "Learn More")),
                     run: () => this.openerService.open(( URI.parse(defaultChat.upgradePlanUrl)))
                 }
             ]
@@ -673,14 +693,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(4655, "Getting Copilot ready..."));
+        const title = ( localize(4690, "Getting Copilot ready..."));
         const badge = this.activityService.showViewContainerActivity(preferCopilotEditsView(this.viewsService) ? CHAT_EDITING_SIDEBAR_PANEL_ID : CHAT_SIDEBAR_PANEL_ID, {
             badge: ( new ProgressBadge(() => title)),
         });
         try {
             await this.progressService.withProgress({
                 location: ProgressLocation.Window,
-                command: TRIGGER_SETUP_COMMAND_ID,
+                command: CHAT_SETUP_ACTION_ID,
                 title,
             }, () => this.doSetup(options?.forceSignIn ?? false, watch));
         }
@@ -706,7 +726,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 entitlement = result.entitlement;
             }
             const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-                message: ( localize(4656, "Copilot is currently only supported in trusted workspaces."))
+                message: ( localize(4691, "Copilot is currently only supported in trusted workspaces."))
             });
             if (!trusted) {
                 this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: watch.elapsed(), signUpErrorCode: undefined });
@@ -728,13 +748,13 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async signIn(providerId) {
         let session;
-        let entitlement;
+        let entitlements;
         try {
             showCopilotView(this.viewsService, this.layoutService);
             session = await this.authenticationService.createSession(providerId, defaultChat.providerScopes[0]);
             this.authenticationExtensionsService.updateAccountPreference(defaultChat.extensionId, providerId, session.account);
             this.authenticationExtensionsService.updateAccountPreference(defaultChat.chatExtensionId, providerId, session.account);
-            entitlement = await this.requests.forceResolveEntitlement(session);
+            entitlements = await this.requests.forceResolveEntitlement(session);
         }
         catch (e) {
             this.logService.error(`[chat setup] signIn: error ${e}`);
@@ -743,18 +763,18 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    4657,
+                    4692,
                     "Failed to sign in to {0}. Would you like to try again?",
                     ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
                 )),
-                detail: ( localize(4658, "You must be signed in to use Copilot.")),
-                primaryButton: ( localize(4651, "Retry"))
+                detail: ( localize(4693, "You must be signed in to use Copilot.")),
+                primaryButton: ( localize(4686, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(providerId);
             }
         }
-        return { session, entitlement };
+        return { session, entitlement: entitlements?.entitlement };
     }
     async install(session, entitlement, providerId, watch) {
         const wasInstalled = this.context.state.installed;
@@ -817,11 +837,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 const { confirmed } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        4659,
+                        4694,
                         "An error occurred while setting up Copilot. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(4651, "Retry"))
+                    primaryButton: ( localize(4686, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstall();
@@ -867,7 +887,7 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
         const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
         {
             const header = ( localize(
-                4660,
+                4695,
                 "[Copilot]({0}) is your AI pair programmer.",
                 this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl
             ));
@@ -879,18 +899,18 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
             const featureChatContainer = featuresContainer.appendChild($('div.chat-feature-container'));
             featureChatContainer.appendChild(renderIcon(Codicon.code));
             const featureChatLabel = featureChatContainer.appendChild($('span'));
-            featureChatLabel.textContent = ( localize(4661, "Code faster with Completions"));
+            featureChatLabel.textContent = ( localize(4696, "Code faster with Completions"));
             const featureEditsContainer = featuresContainer.appendChild($('div.chat-feature-container'));
             featureEditsContainer.appendChild(renderIcon(Codicon.editSession));
             const featureEditsLabel = featureEditsContainer.appendChild($('span'));
-            featureEditsLabel.textContent = ( localize(4662, "Build features with Copilot Edits"));
+            featureEditsLabel.textContent = ( localize(4697, "Build features with Copilot Edits"));
             const featureExploreContainer = featuresContainer.appendChild($('div.chat-feature-container'));
             featureExploreContainer.appendChild(renderIcon(Codicon.commentDiscussion));
             const featureExploreLabel = featureExploreContainer.appendChild($('span'));
-            featureExploreLabel.textContent = ( localize(4663, "Explore your codebase with Chat"));
+            featureExploreLabel.textContent = ( localize(4698, "Explore your codebase with Chat"));
         }
         const free = ( localize(
-            4664,
+            4699,
             "$(sparkle-filled) We now offer [Copilot for free]({0}).",
             defaultChat.skusDocumentationUrl
         ));
@@ -900,8 +920,8 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
         buttonContainer.classList.add('button-container');
         const button = this._register(( new ButtonWithDropdown(buttonContainer, {
             actions: [
-                toAction({ id: 'chatSetup.setupWithProvider', label: ( localize(4665, "Sign in with a {0} Account", defaultChat.providerName)), run: () => this.setupWithProvider(false) }),
-                toAction({ id: 'chatSetup.setupWithEnterpriseProvider', label: ( localize(4666, "Sign in with a {0} Account", defaultChat.enterpriseProviderName)), run: () => this.setupWithProvider(true) })
+                toAction({ id: 'chatSetup.setupWithProvider', label: ( localize(4700, "Sign in with a {0} Account", defaultChat.providerName)), run: () => this.setupWithProvider(false) }),
+                toAction({ id: 'chatSetup.setupWithEnterpriseProvider', label: ( localize(4701, "Sign in with a {0} Account", defaultChat.enterpriseProviderName)), run: () => this.setupWithProvider(true) })
             ],
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
@@ -910,14 +930,14 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
         })));
         this._register(button.onDidClick(() => this.controller.setup()));
         const terms = ( localize(
-            4667,
+            4702,
             "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).",
             defaultChat.termsStatementUrl,
             defaultChat.privacyStatementUrl
         ));
         this.element.appendChild($('p')).appendChild(this._register(markdown.render(( new MarkdownString(terms, { isTrusted: true })))).element);
         const settings = ( localize(
-            4668,
+            4703,
             "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
@@ -933,33 +953,33 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
         switch (this.context.state.entitlement) {
             case ChatEntitlement.Unknown:
                 showFree = true;
-                buttonLabel = this.context.state.registered ? ( localize(4669, "Sign in to Use Copilot")) : ( localize(4670, "Sign in to Use Copilot for Free"));
+                buttonLabel = this.context.state.registered ? ( localize(4704, "Sign in to Use Copilot")) : ( localize(4705, "Sign in to Use Copilot for Free"));
                 break;
             case ChatEntitlement.Unresolved:
                 showFree = true;
-                buttonLabel = this.context.state.registered ? ( localize(4671, "Use Copilot")) : ( localize(4672, "Use Copilot for Free"));
+                buttonLabel = this.context.state.registered ? ( localize(4706, "Use Copilot")) : ( localize(4707, "Use Copilot for Free"));
                 break;
             case ChatEntitlement.Available:
             case ChatEntitlement.Limited:
                 showFree = true;
-                buttonLabel = ( localize(4672, "Use Copilot for Free"));
+                buttonLabel = ( localize(4707, "Use Copilot for Free"));
                 break;
             case ChatEntitlement.Pro:
             case ChatEntitlement.Unavailable:
                 showFree = false;
-                buttonLabel = ( localize(4671, "Use Copilot"));
+                buttonLabel = ( localize(4706, "Use Copilot"));
                 break;
         }
         switch (this.controller.step) {
             case ChatSetupStep.SigningIn:
                 buttonLabel = ( localize(
-                    4673,
+                    4708,
                     "$(loading~spin) Signing in to {0}...",
                     ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName
                 ));
                 break;
             case ChatSetupStep.Installing:
-                buttonLabel = ( localize(4674, "$(loading~spin) Getting Copilot Ready..."));
+                buttonLabel = ( localize(4709, "$(loading~spin) Getting Copilot Ready..."));
                 break;
         }
         setVisibility(showFree, freeContainer);
@@ -982,11 +1002,11 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
             }
         });
         if (useEnterpriseProvider) {
-            await this.configurationService.updateValue(defaultChat.providerSetting, defaultChat.enterpriseProviderId, ConfigurationTarget.USER);
             const success = await this.handleEnterpriseInstance();
             if (!success) {
                 return;
             }
+            await this.configurationService.updateValue(defaultChat.providerSetting, defaultChat.enterpriseProviderId, ConfigurationTarget.USER);
         }
         else {
             await this.configurationService.updateValue(defaultChat.providerSetting, undefined, ConfigurationTarget.USER);
@@ -995,38 +1015,38 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
         return this.controller.setup({ forceSignIn: true });
     }
     async handleEnterpriseInstance() {
+        const domainRegEx = /^[a-zA-Z\-_]+$/;
+        const fullUriRegEx = /^(https:\/\/)?([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.ghe\.com\/?$/;
         const uri = this.configurationService.getValue(defaultChat.providerUriSetting);
-        if (uri) {
+        if (typeof uri === 'string' && fullUriRegEx.test(uri)) {
             return true;
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(4675, "What is your {0} instance?", defaultChat.enterpriseProviderName)),
-            placeHolder: ( localize(4676, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
+            prompt: ( localize(4710, "What is your {0} instance?", defaultChat.enterpriseProviderName)),
+            placeHolder: ( localize(4711, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
+            value: uri,
             validateInput: async (value) => {
                 isSingleWord = false;
                 if (!value) {
                     return undefined;
                 }
-                if (/^[a-zA-Z\-_]+$/.test(value)) {
+                if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(4677, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(4712, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
-                else {
-                    const regex = /^(https:\/\/)?([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.ghe\.com\/?$/;
-                    if (!regex.test(value)) {
-                        return {
-                            content: ( localize(
-                                4678,
-                                'Please enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")',
-                                defaultChat.enterpriseProviderName
-                            )),
-                            severity: Severity.Error
-                        };
-                    }
+                if (!fullUriRegEx.test(value)) {
+                    return {
+                        content: ( localize(
+                            4713,
+                            'Please enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")',
+                            defaultChat.enterpriseProviderName
+                        )),
+                        severity: Severity.Error
+                    };
                 }
                 return undefined;
             }
@@ -1035,11 +1055,11 @@ let ChatSetupWelcomeContent = class ChatSetupWelcomeContent extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    4679,
+                    4714,
                     "The provided {0} instance is invalid. Would you like to enter it again?",
                     defaultChat.enterpriseProviderName
                 )),
-                primaryButton: ( localize(4651, "Retry"))
+                primaryButton: ( localize(4686, "Retry"))
             });
             if (confirmed) {
                 return this.handleEnterpriseInstance();
@@ -1171,4 +1191,4 @@ function refreshTokens(commandService) {
     commandService.executeCommand('github.copilot.refreshToken');
 }
 
-export { ChatSetupContribution };
+export { ChatEntitlementsService, ChatSetupContribution };