@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -4,6 +4,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import * as chatSetup from './media/chatSetup.css';
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Dialog, DialogContentsAlignment } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/base/browser/ui/dialog/dialog';
+import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
@@ -25,8 +26,10 @@ import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/plat
 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 { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.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 { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
@@ -43,9 +46,12 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { ProgressBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
+import { ProgressBadge } from '@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-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 { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { ExtensionUrlHandlerOverrideRegistry } from '@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler';
 import { nullExtensionDescription } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
@@ -61,6 +67,7 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { ChatEntitlement, ChatEntitlementRequests, isProUser } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
 import { ChatRequestModel } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatMode } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { ChatRequestToolPart, ChatRequestAgentPart } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatConfiguration, ChatAgentLocation, ChatModeKind, validateChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
@@ -69,11 +76,10 @@ import { CHAT_SETUP_ACTION_ID, CHAT_CATEGORY, CHAT_OPEN_ACTION_ID } from '@codin
 import { showCopilotView, ChatViewId } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
-import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { ChatMode } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { chatViewsWelcomeRegistry } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
+import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 
-var SetupAgent_1, ChatSetup_1;
+var SetupAgent_1, ChatSetup_1, ChatTeardownContribution_1;
 registerCss(chatSetup);
 const defaultChat = {
     extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -91,6 +97,8 @@ const defaultChat = {
     walkthroughCommand: product.defaultChatAgent?.walkthroughCommand ?? '',
     completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
     chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
+    termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
+    privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ''
 };
 const ToolsAgentContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentEnabled}`, true)),
 ContextKeyExpr.not(`previewFeaturesDisabled`)));
@@ -128,24 +136,28 @@ let SetupAgent = class SetupAgent extends Disposable {
             return SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, id, `${defaultChat.provider.default.name} Copilot`, true, description, location, mode, context, controller);
         });
     }
-    static registerVSCodeAgent(instantiationService, context, controller) {
+    static registerBuiltInAgents(instantiationService, context, controller) {
         return instantiationService.invokeFunction(accessor => {
             const chatAgentService = accessor.get(IChatAgentService);
             const disposables = ( new DisposableStore());
-            const { agent, disposable } = SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, ( localize2(5092, "Ask questions about VS Code")).value, ChatAgentLocation.Panel, undefined, context, controller);
-            disposables.add(disposable);
+            const { disposable: vscodeDisposable } = SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, ( localize2(5202, "Ask questions about VS Code")).value, ChatAgentLocation.Panel, undefined, context, controller);
+            disposables.add(vscodeDisposable);
+            const { disposable: workspaceDisposable } = SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, 'setup.workspace', 'workspace', false, ( localize2(5203, "Ask about your workspace")).value, ChatAgentLocation.Panel, undefined, context, controller);
+            disposables.add(workspaceDisposable);
+            const { disposable: terminalDisposable } = SetupAgent_1.doRegisterAgent(instantiationService, chatAgentService, 'setup.terminal.agent', 'terminal', false, ( localize2(5204, "Ask how to do something in the terminal")).value, ChatAgentLocation.Panel, undefined, context, controller);
+            disposables.add(terminalDisposable);
             disposables.add(SetupTool.registerTool(instantiationService, {
-                id: 'setup.tools.createNewWorkspace',
+                id: 'setup_tools_createNewWorkspace',
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(5093, "New Workspace")),
-                modelDescription: ( localize(5094, "Scaffold a new workspace in VS Code")),
-                userDescription: ( localize(5094, "Scaffold a new workspace in VS Code")),
+                displayName: ( localize(5205, "New Workspace")),
+                modelDescription: ( localize(5206, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(5206, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: 'new',
                 when: ContextKeyExpr.true(),
             }).disposable);
-            return { agent, disposable: disposables };
+            return { disposable: disposables };
         });
     }
     static doRegisterAgent(instantiationService, chatAgentService, id, name, isDefault, description, location, mode, context, controller) {
@@ -163,6 +175,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             metadata: { helpTextPrefix: SetupAgent_1.SETUP_NEEDED_MESSAGE },
             description,
             extensionId: nullExtensionDescription.identifier,
+            extensionVersion: undefined,
             extensionDisplayName: nullExtensionDescription.name,
             extensionPublisherId: nullExtensionDescription.publisher
         }));
@@ -173,8 +186,8 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         return { agent, disposable: disposables };
     }
-    static { this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(5095, "You need to set up Copilot and be signed in to use Chat.")))); }
-    static { this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(5096, "You need to trust this workspace to use Chat.")))); }
+    static { this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(5207, "You need to set up GitHub Copilot and be signed in to use Chat.")))); }
+    static { this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(5208, "You need to trust this workspace to use Chat.")))); }
     constructor(context, controller, location, instantiationService, logService, configurationService, telemetryService, environmentService, workspaceTrustManagementService) {
         super();
         this.context = context;
@@ -214,7 +227,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: 'progressMessage',
-            content: ( new MarkdownString(( localize(5097, "Getting Copilot ready")))),
+            content: ( new MarkdownString(( localize(5209, "Getting chat ready...")))),
         });
         await this.forwardRequestToCopilot(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
         return {};
@@ -226,7 +239,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         catch (error) {
             progress({
                 kind: 'warning',
-                content: ( new MarkdownString(( localize(5098, "Copilot failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(5210, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -245,16 +258,19 @@ let SetupAgent = class SetupAgent extends Disposable {
     }
     async doForwardRequestToCopilotWhenReady(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService) {
         const widget = chatWidgetService.getWidgetBySessionId(requestModel.session.sessionId);
-        const mode = widget?.input.currentModeKind;
+        const modeInfo = widget?.input.currentModeInfo;
         const languageModel = widget?.input.currentLanguageModel;
-        const whenAgentReady = this.whenAgentReady(chatAgentService, mode);
-        const whenLanguageModelReady = this.whenLanguageModelReady(languageModelsService);
-        const whenToolsModelReady = this.whenToolsModelReady(languageModelToolsService, requestModel);
+        let agentReady = false;
+        let languageModelReady = false;
+        let toolsModelReady = false;
+        const whenAgentReady = this.whenAgentReady(chatAgentService, modeInfo?.kind)?.then(() => agentReady = true);
+        const whenLanguageModelReady = this.whenLanguageModelReady(languageModelsService)?.then(() => languageModelReady = true);
+        const whenToolsModelReady = this.whenToolsModelReady(languageModelToolsService, requestModel)?.then(() => toolsModelReady = true);
         if (whenLanguageModelReady instanceof Promise || whenAgentReady instanceof Promise || whenToolsModelReady instanceof Promise) {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: 'progressMessage',
-                    content: ( new MarkdownString(( localize(5099, "Copilot is almost ready")))),
+                    content: ( new MarkdownString(( localize(5211, "Chat is almost ready...")))),
                 });
             }, 10000);
             try {
@@ -267,20 +283,25 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (ready === 'timedout') {
                         warningMessage = ( localize(
-                            5100,
-                            "Copilot took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.",
+                            5212,
+                            "Chat took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.",
                             defaultChat.provider.default.name,
                             defaultChat.chatExtensionId
                         ));
                     }
                     else {
                         warningMessage = ( localize(
-                            5101,
-                            "Copilot failed to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.",
+                            5213,
+                            "Chat failed to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.",
                             defaultChat.provider.default.name,
                             defaultChat.chatExtensionId
                         ));
                     }
+                    this.logService.warn(warningMessage, {
+                        agentReady: whenAgentReady ? agentReady : undefined,
+                        languageModelReady: whenLanguageModelReady ? languageModelReady : undefined,
+                        toolsModelReady: whenToolsModelReady ? toolsModelReady : undefined
+                    });
                     progress({
                         kind: 'warning',
                         content: ( new MarkdownString(warningMessage))
@@ -295,7 +316,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         await chatService.resendRequest(requestModel, {
             ...widget?.getModeRequestOptions(),
-            mode,
+            modeInfo,
             userSelectedModelId: languageModel,
         });
     }
@@ -358,8 +379,8 @@ let SetupAgent = class SetupAgent extends Disposable {
                     progress({
                         kind: 'progressMessage',
                         content: ( new MarkdownString(( localize(
-                            5102,
-                            "Signing in to {0}.",
+                            5214,
+                            "Signing in to {0}...",
                             ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id ? defaultChat.provider.enterprise.name : defaultChat.provider.default.name
                         )))),
                     });
@@ -367,7 +388,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 case ChatSetupStep.Installing:
                     progress({
                         kind: 'progressMessage',
-                        content: ( new MarkdownString(( localize(5103, "Getting Copilot ready")))),
+                        content: ( new MarkdownString(( localize(5215, "Getting chat ready...")))),
                     });
                     break;
             }
@@ -396,7 +417,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             else {
                 progress({
                     kind: 'warning',
-                    content: ( new MarkdownString(( localize(5104, "Copilot setup failed."))))
+                    content: ( new MarkdownString(( localize(5216, "Chat setup failed."))))
                 });
             }
         }
@@ -433,6 +454,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             variableData: requestModel.variableData,
             timestamp: Date.now(),
             attempt: requestModel.attempt,
+            modeInfo: requestModel.modeInfo,
             confirmation: requestModel.confirmation,
             locationData: requestModel.locationData,
             attachedContext: requestModel.attachedContext,
@@ -477,6 +499,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             variableData: variableData,
             timestamp: Date.now(),
             attempt: requestModel.attempt,
+            modeInfo: requestModel.modeInfo,
             confirmation: requestModel.confirmation,
             locationData: requestModel.locationData,
             attachedContext: [chatRequestToolEntry],
@@ -497,9 +520,8 @@ class SetupTool extends Disposable {
         return instantiationService.invokeFunction(accessor => {
             const toolService = accessor.get(ILanguageModelToolsService);
             const disposables = ( new DisposableStore());
-            disposables.add(toolService.registerToolData(toolData));
             const tool = instantiationService.createInstance(SetupTool);
-            disposables.add(toolService.registerToolImplementation(toolData.id, tool));
+            disposables.add(toolService.registerTool(toolData, tool));
             return { tool, disposable: disposables };
         });
     }
@@ -586,7 +608,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(5105, "Copilot is currently only supported in trusted workspaces."))
+            message: ( localize(5217, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({ later: true });
@@ -610,19 +632,19 @@ let ChatSetup = class ChatSetup {
         try {
             switch (setupStrategy) {
                 case ChatSetupStrategy.SetupWithEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useSocialProvider: undefined });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useSocialProvider: undefined, additionalScopes: options?.additionalScopes });
                     break;
                 case ChatSetupStrategy.SetupWithoutEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: undefined });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: undefined, additionalScopes: options?.additionalScopes });
                     break;
                 case ChatSetupStrategy.SetupWithAppleProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'apple' });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'apple', additionalScopes: options?.additionalScopes });
                     break;
                 case ChatSetupStrategy.SetupWithGoogleProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'google' });
+                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'google', additionalScopes: options?.additionalScopes });
                     break;
                 case ChatSetupStrategy.DefaultSetup:
-                    success = await this.controller.value.setup();
+                    success = await this.controller.value.setup(options);
                     break;
                 case ChatSetupStrategy.Canceled:
                     this.context.update({ later: true });
@@ -664,49 +686,55 @@ let ChatSetup = class ChatSetup {
         const styleButton = (...classes) => ({ styleButton: (button) => button.element.classList.add(...classes) });
         let buttons;
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            const defaultProviderButton = [( localize(5106, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton('continue-button', 'default')];
+            const defaultProviderButton = [( localize(5218, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton('continue-button', 'default')];
             const defaultProviderLink = [defaultProviderButton[0], defaultProviderButton[1], styleButton('link-button')];
-            const enterpriseProviderButton = [( localize(5106, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton('continue-button', 'default')];
+            const enterpriseProviderButton = [( localize(5218, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton('continue-button', 'default')];
             const enterpriseProviderLink = [enterpriseProviderButton[0], enterpriseProviderButton[1], styleButton('link-button')];
-            const googleProviderButton = [( localize(5106, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton('continue-button', 'google')];
+            const googleProviderButton = [( localize(5218, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton('continue-button', 'google')];
+            const appleProviderButton = [( localize(5218, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton('continue-button', 'apple')];
             if (ChatEntitlementRequests.providerId(this.configurationService) !== defaultChat.provider.enterprise.id) {
                 buttons = coalesce([
                     defaultProviderButton,
-                    variant === 'google' ? googleProviderButton : undefined,
+                    googleProviderButton,
+                    variant === 'apple' ? appleProviderButton : undefined,
                     enterpriseProviderLink
                 ]);
             }
             else {
                 buttons = coalesce([
                     enterpriseProviderButton,
-                    variant === 'google' ? googleProviderButton : undefined,
+                    googleProviderButton,
+                    variant === 'apple' ? appleProviderButton : undefined,
                     defaultProviderLink
                 ]);
             }
         }
         else {
-            buttons = [[( localize(5107, "Set up Copilot")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(5219, "Set up Copilot")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
-        buttons.push([( localize(5108, "Skip for now")), ChatSetupStrategy.Canceled, styleButton('link-button', 'skip-button')]);
+        buttons.push([( localize(5220, "Skip for now")), ChatSetupStrategy.Canceled, styleButton('link-button', 'skip-button')]);
         return buttons;
     }
     getDialogTitle(options) {
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(5109, "Sign in to use Copilot");
+            return localize(5221, "Sign in to use GitHub Copilot");
         }
-        return localize(5110, "Start using Copilot");
+        return localize(5222, "Start using GitHub Copilot");
     }
     createDialogFooter(disposables) {
         const element = $('.chat-setup-dialog-footer');
         const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
-        const settings = ( localize(
-            5111,
-            "{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.",
+        const footer = ( localize(
+            5223,
+            "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}). {3} Copilot may show [public code]({4}) suggestions and use your data to improve the product. You can change these [settings]({5}) anytime.",
+            defaultChat.provider.default.name,
+            defaultChat.termsStatementUrl,
+            defaultChat.privacyStatementUrl,
             defaultChat.provider.default.name,
             defaultChat.publicCodeMatchesUrl,
             defaultChat.manageSettingsUrl
         ));
-        element.appendChild($('p', undefined, disposables.add(markdown.render(( new MarkdownString(settings, { isTrusted: true })))).element));
+        element.appendChild($('p', undefined, disposables.add(markdown.render(( new MarkdownString(footer, { isTrusted: true })))).element));
         return element;
     }
 };
@@ -723,13 +751,14 @@ ChatSetup = ChatSetup_1 = ( __decorate([
 ], ChatSetup));
 let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatSetup'; }
-    constructor(productService, instantiationService, commandService, telemetryService, chatEntitlementService, logService) {
+    constructor(productService, instantiationService, commandService, telemetryService, chatEntitlementService, logService, contextKeyService) {
         super();
         this.productService = productService;
         this.instantiationService = instantiationService;
         this.commandService = commandService;
         this.telemetryService = telemetryService;
         this.logService = logService;
+        this.contextKeyService = contextKeyService;
         const context = chatEntitlementService.context?.value;
         const requests = chatEntitlementService.requests?.value;
         if (!context || !requests) {
@@ -754,40 +783,48 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         const { agent, disposable } = SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Panel, mode, context, controller);
                         panelAgentDisposables.add(disposable);
                         panelAgentDisposables.add(agent.onUnresolvableError(() => {
-                            this.logService.error('[chat setup] Unresolvable error from Copilot agent registration, clearing registration.');
-                            panelAgentDisposables.dispose();
+                            const panelAgentHasGuidance = ( chatViewsWelcomeRegistry.get().some(descriptor => this.contextKeyService.contextMatchesRules(descriptor.when)));
+                            if (panelAgentHasGuidance) {
+                                this.logService.error('[chat setup] Unresolvable error from Copilot agent registration, clearing registration.');
+                                panelAgentDisposables.dispose();
+                            }
                         }));
                     }
                     disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Terminal, undefined, context, controller).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 && !context.state.disabled) && !vscodeAgentDisposables.value) {
+                if ((!context.state.installed || context.state.entitlement === ChatEntitlement.Unknown || context.state.entitlement === ChatEntitlement.Unresolved) && !vscodeAgentDisposables.value) {
                     const disposables = vscodeAgentDisposables.value = ( new DisposableStore());
-                    disposables.add(SetupAgent.registerVSCodeAgent(this.instantiationService, context, controller).disposable);
+                    disposables.add(SetupAgent.registerBuiltInAgents(this.instantiationService, context, controller).disposable);
                 }
             }
             else {
                 defaultAgentDisposables.clear();
                 vscodeAgentDisposables.clear();
             }
-            if (context.state.installed && !context.state.disabled) {
+            if ((context.state.installed && context.state.entitlement !== ChatEntitlement.Unknown && context.state.entitlement !== ChatEntitlement.Unresolved) && !context.state.disabled) {
                 vscodeAgentDisposables.clear();
             }
         };
         this._register(Event.runAndSubscribe(context.onDidChange, () => updateRegistration()));
     }
     registerActions(context, requests, controller) {
-        const chatSetupTriggerContext = ( ContextKeyExpr.or(( ChatContextKeys.Setup.installed.negate()), ChatContextKeys.Entitlement.canSignUp));
-        const CHAT_SETUP_ACTION_LABEL = ( localize2(5112, "Use AI Features with Copilot for free..."));
         class ChatSetupTriggerAction extends Action2 {
+            static { this.CHAT_SETUP_ACTION_LABEL = ( localize2(5224, "Use AI Features with Copilot for free...")); }
             constructor() {
                 super({
                     id: CHAT_SETUP_ACTION_ID,
-                    title: CHAT_SETUP_ACTION_LABEL,
+                    title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL,
                     category: CHAT_CATEGORY,
                     f1: true,
-                    precondition: chatSetupTriggerContext
+                    precondition: ( ContextKeyExpr.or(
+                        ChatContextKeys.Setup.hidden,
+                        ChatContextKeys.Setup.disabled,
+                        ChatContextKeys.Setup.untrusted,
+                        ( ChatContextKeys.Setup.installed.negate()),
+                        ChatContextKeys.Entitlement.canSignUp
+                    ))
                 });
             }
             async run(accessor, mode, options) {
@@ -797,18 +834,26 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const dialogService = accessor.get(IDialogService);
                 const commandService = accessor.get(ICommandService);
                 const lifecycleService = accessor.get(ILifecycleService);
+                const configurationService = accessor.get(IConfigurationService);
                 await context.update({ hidden: false });
+                configurationService.updateValue(ChatTeardownContribution.CHAT_DISABLED_CONFIGURATION_KEY, false);
                 if (mode) {
                     const chatWidget = await showCopilotView(viewsService, layoutService);
                     chatWidget?.input.setChatMode(mode);
                 }
+                if (options?.forceNoDialog) {
+                    const chatWidget = await showCopilotView(viewsService, layoutService);
+                    ChatSetup.getInstance(instantiationService, context, controller).skipDialog();
+                    chatWidget?.acceptInput(( localize(5225, "Set up chat.")));
+                    return true;
+                }
                 const setup = ChatSetup.getInstance(instantiationService, context, controller);
                 const { success } = await setup.run(options);
                 if (success === false && !lifecycleService.willShutdown) {
                     const { confirmed } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(5113, "Copilot setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(5114, "Retry")),
+                        message: ( localize(5226, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(5227, "Retry")),
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -821,7 +866,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupForceSignIn',
-                    title: ( localize2(5115, "Sign in to use Copilot"))
+                    title: ( localize2(5228, "Sign in to use AI features"))
                 });
             }
             async run(accessor) {
@@ -835,25 +880,21 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupWithoutDialog',
-                    title: CHAT_SETUP_ACTION_LABEL,
-                    precondition: chatSetupTriggerContext
+                    title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL
                 });
             }
             async run(accessor) {
-                const viewsService = accessor.get(IViewsService);
-                const layoutService = accessor.get(IWorkbenchLayoutService);
-                const instantiationService = accessor.get(IInstantiationService);
-                await context.update({ hidden: false });
-                const chatWidget = await showCopilotView(viewsService, layoutService);
-                ChatSetup.getInstance(instantiationService, context, controller).skipDialog();
-                chatWidget?.acceptInput(( localize(5116, "Set up Copilot.")));
+                const commandService = accessor.get(ICommandService);
+                const telemetryService = accessor.get(ITelemetryService);
+                telemetryService.publicLog2('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
+                return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, { forceNoDialog: true });
             }
         }
         class ChatSetupFromAccountsAction extends Action2 {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupFromAccounts',
-                    title: ( localize2(5117, "Sign in to use Copilot...")),
+                    title: ( localize2(5229, "Sign in to use AI features...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: '2_copilot',
@@ -868,71 +909,30 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 return commandService.executeCommand(CHAT_SETUP_ACTION_ID);
             }
         }
-        class ChatSetupHideAction extends Action2 {
-            static { this.ID = 'workbench.action.chat.hideSetup'; }
-            static { this.TITLE = ( localize2(5118, "Hide AI Features")); }
-            constructor() {
-                super({
-                    id: ChatSetupHideAction.ID,
-                    title: ChatSetupHideAction.TITLE,
-                    f1: true,
-                    category: CHAT_CATEGORY,
-                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.installed.negate()), ( ChatContextKeys.Setup.hidden.negate()))),
-                    menu: {
-                        id: MenuId.ChatTitleBarMenu,
-                        group: 'z_hide',
-                        order: 1,
-                        when: ( ChatContextKeys.Setup.installed.negate())
-                    }
-                });
-            }
-            async run(accessor) {
-                const viewsDescriptorService = accessor.get(IViewDescriptorService);
-                const layoutService = accessor.get(IWorkbenchLayoutService);
-                const dialogService = accessor.get(IDialogService);
-                const { confirmed } = await dialogService.confirm({
-                    message: ( localize(5119, "Are you sure you want to hide AI features?")),
-                    detail: ( localize(
-                        5120,
-                        "You can restore AI features by running the '{0}' command.",
-                        CHAT_SETUP_ACTION_LABEL.value
-                    )),
-                    primaryButton: ( localize(5121, "Hide AI Features"))
-                });
-                if (!confirmed) {
-                    return;
-                }
-                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);
-                    }
-                }
-            }
-        }
         const windowFocusListener = this._register(( new MutableDisposable()));
         class UpgradePlanAction extends Action2 {
             constructor() {
                 super({
                     id: 'workbench.action.chat.upgradePlan',
-                    title: ( localize2(5122, "Upgrade to Copilot Pro")),
-                    category: ( localize2(5123, 'Chat')),
+                    title: ( localize2(5230, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(5231, 'Chat')),
                     f1: true,
-                    precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.canSignUp, ChatContextKeys.Entitlement.free)),
+                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ContextKeyExpr.or(
+                        ChatContextKeys.Entitlement.canSignUp,
+                        ChatContextKeys.Entitlement.planFree
+                    )))),
                     menu: {
                         id: MenuId.ChatTitleBarMenu,
                         group: 'a_first',
                         order: 1,
-                        when: ( ContextKeyExpr.and(ChatContextKeys.Entitlement.free, ( ContextKeyExpr.or(
+                        when: ( ContextKeyExpr.and(ChatContextKeys.Entitlement.planFree, ( ContextKeyExpr.or(
                             ChatContextKeys.chatQuotaExceeded,
                             ChatContextKeys.completionsQuotaExceeded
                         ))))
                     }
                 });
             }
-            async run(accessor, from) {
+            async run(accessor) {
                 const openerService = accessor.get(IOpenerService);
                 const hostService = accessor.get(IHostService);
                 const commandService = accessor.get(ICommandService);
@@ -956,22 +956,28 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.manageOverages',
-                    title: ( localize2(5124, "Manage Copilot Overages")),
-                    category: ( localize2(5123, 'Chat')),
+                    title: ( localize2(5232, "Manage GitHub Copilot Overages")),
+                    category: ( localize2(5231, 'Chat')),
                     f1: true,
-                    precondition: ( ContextKeyExpr.or(ChatContextKeys.Entitlement.pro, ChatContextKeys.Entitlement.proPlus)),
+                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ContextKeyExpr.or(
+                        ChatContextKeys.Entitlement.planPro,
+                        ChatContextKeys.Entitlement.planProPlus
+                    )))),
                     menu: {
                         id: MenuId.ChatTitleBarMenu,
                         group: 'a_first',
                         order: 1,
-                        when: ( ContextKeyExpr.and(( ContextKeyExpr.or(ChatContextKeys.Entitlement.pro, ChatContextKeys.Entitlement.proPlus)), ( ContextKeyExpr.or(
+                        when: ( ContextKeyExpr.and(( ContextKeyExpr.or(
+                            ChatContextKeys.Entitlement.planPro,
+                            ChatContextKeys.Entitlement.planProPlus
+                        )), ( ContextKeyExpr.or(
                             ChatContextKeys.chatQuotaExceeded,
                             ChatContextKeys.completionsQuotaExceeded
                         ))))
                     }
                 });
             }
-            async run(accessor, from) {
+            async run(accessor) {
                 const openerService = accessor.get(IOpenerService);
                 openerService.open(( URI.parse(defaultChat.manageOveragesUrl)));
             }
@@ -980,7 +986,6 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         registerAction2(ChatSetupTriggerForceSignInDialogAction);
         registerAction2(ChatSetupFromAccountsAction);
         registerAction2(ChatSetupTriggerWithoutDialogAction);
-        registerAction2(ChatSetupHideAction);
         registerAction2(UpgradePlanAction);
         registerAction2(EnableOveragesAction);
     }
@@ -1004,8 +1009,109 @@ ChatSetupContribution = ( __decorate([
     ( __param(2, ICommandService)),
     ( __param(3, ITelemetryService)),
     ( __param(4, IChatEntitlementService)),
-    ( __param(5, ILogService))
+    ( __param(5, ILogService)),
+    ( __param(6, IContextKeyService))
 ], ChatSetupContribution));
+let ChatTeardownContribution = class ChatTeardownContribution extends Disposable {
+    static { ChatTeardownContribution_1 = this; }
+    static { this.ID = 'workbench.contrib.chatTeardown'; }
+    static { this.CHAT_DISABLED_CONFIGURATION_KEY = 'chat.disableAIFeatures'; }
+    constructor(chatEntitlementService, configurationService, extensionsWorkbenchService, extensionEnablementService, viewDescriptorService, layoutService) {
+        super();
+        this.configurationService = configurationService;
+        this.extensionsWorkbenchService = extensionsWorkbenchService;
+        this.extensionEnablementService = extensionEnablementService;
+        this.viewDescriptorService = viewDescriptorService;
+        this.layoutService = layoutService;
+        const context = chatEntitlementService.context?.value;
+        if (!context) {
+            return;
+        }
+        this.registerListeners();
+        this.registerActions();
+        this.handleChatDisabled(false);
+    }
+    handleChatDisabled(fromEvent) {
+        const chatDisabled = this.configurationService.inspect(ChatTeardownContribution_1.CHAT_DISABLED_CONFIGURATION_KEY);
+        if (chatDisabled.value === true) {
+            this.maybeEnableOrDisableExtension(typeof chatDisabled.workspaceValue === 'boolean' ? EnablementState.DisabledWorkspace : EnablementState.DisabledGlobally);
+            if (fromEvent) {
+                this.maybeHideAuxiliaryBar();
+            }
+        }
+        else if (chatDisabled.value === false && fromEvent ) {
+            this.maybeEnableOrDisableExtension(typeof chatDisabled.workspaceValue === 'boolean' ? EnablementState.EnabledWorkspace : EnablementState.EnabledGlobally);
+        }
+    }
+    async registerListeners() {
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (!e.affectsConfiguration(ChatTeardownContribution_1.CHAT_DISABLED_CONFIGURATION_KEY)) {
+                return;
+            }
+            this.handleChatDisabled(true);
+        }));
+        await this.extensionsWorkbenchService.queryLocal();
+        this._register(this.extensionsWorkbenchService.onChange(e => {
+            if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.chatExtensionId)) {
+                return;
+            }
+            const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
+            if (defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local)) {
+                this.configurationService.updateValue(ChatTeardownContribution_1.CHAT_DISABLED_CONFIGURATION_KEY, false);
+            }
+        }));
+    }
+    async maybeEnableOrDisableExtension(state) {
+        const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
+        if (!defaultChatExtension) {
+            return;
+        }
+        await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
+        await this.extensionsWorkbenchService.updateRunningExtensions(state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(5233, "Enabling AI features")) : ( localize(5234, "Disabling AI features")));
+    }
+    maybeHideAuxiliaryBar() {
+        const activeContainers = this.viewDescriptorService.getViewContainersByLocation(ViewContainerLocation.AuxiliaryBar).filter(container => this.viewDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0);
+        if ((activeContainers.length === 0) ||
+            (activeContainers.length === 1 && activeContainers.at(0)?.id === CHAT_SIDEBAR_PANEL_ID)
+        ) {
+            this.layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART);
+        }
+    }
+    registerActions() {
+        class ChatSetupHideAction extends Action2 {
+            static { this.ID = 'workbench.action.chat.hideSetup'; }
+            static { this.TITLE = ( localize2(5235, "Learn How to Hide AI Features")); }
+            constructor() {
+                super({
+                    id: ChatSetupHideAction.ID,
+                    title: ChatSetupHideAction.TITLE,
+                    f1: true,
+                    category: CHAT_CATEGORY,
+                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.installed.negate()))),
+                    menu: {
+                        id: MenuId.ChatTitleBarMenu,
+                        group: 'z_hide',
+                        order: 1,
+                        when: ( ChatContextKeys.Setup.installed.negate())
+                    }
+                });
+            }
+            async run(accessor) {
+                const preferencesService = accessor.get(IPreferencesService);
+                preferencesService.openSettings({ jsonEditor: false, query: `@id:${ChatTeardownContribution_1.CHAT_DISABLED_CONFIGURATION_KEY}` });
+            }
+        }
+        registerAction2(ChatSetupHideAction);
+    }
+};
+ChatTeardownContribution = ChatTeardownContribution_1 = ( __decorate([
+    ( __param(0, IChatEntitlementService)),
+    ( __param(1, IConfigurationService)),
+    ( __param(2, IExtensionsWorkbenchService)),
+    ( __param(3, IWorkbenchExtensionEnablementService)),
+    ( __param(4, IViewDescriptorService)),
+    ( __param(5, IWorkbenchLayoutService))
+], ChatTeardownContribution));
 var ChatSetupStep;
 (function (ChatSetupStep) {
     ChatSetupStep[ChatSetupStep["Initial"] = 1] = "Initial";
@@ -1047,7 +1153,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(5125, "Getting Copilot ready..."));
+        const title = ( localize(5236, "Getting chat ready..."));
         const badge = this.activityService.showViewContainerActivity(CHAT_SIDEBAR_PANEL_ID, {
             badge: ( new ProgressBadge(() => title)),
         });
@@ -1103,12 +1209,12 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    5126,
+                    5237,
                     "Failed to sign in to {0}. Would you like to try again?",
                     ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id ? defaultChat.provider.enterprise.name : defaultChat.provider.default.name
                 )),
-                detail: ( localize(5127, "You must be signed in to use Copilot.")),
-                primaryButton: ( localize(5114, "Retry"))
+                detail: ( localize(5238, "You must be signed in to use AI features.")),
+                primaryButton: ( localize(5227, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(options);
@@ -1120,23 +1226,25 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         const wasRunning = this.context.state.installed && !this.context.state.disabled;
         let signUpResult = undefined;
         const provider = options.useSocialProvider ?? options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id;
+        let sessions = session ? [session] : undefined;
         try {
             if (entitlement !== ChatEntitlement.Free &&
                 !isProUser(entitlement) &&
                 entitlement !== ChatEntitlement.Unavailable
             ) {
-                if (!session) {
+                if (!sessions) {
                     try {
-                        session = (await this.authenticationService.getSessions(providerId)).at(0);
+                        const existingSessions = await this.authenticationService.getSessions(providerId);
+                        sessions = existingSessions.length > 0 ? [...existingSessions] : undefined;
                     }
                     catch (error) {
                     }
-                    if (!session) {
+                    if (!sessions || sessions.length === 0) {
                         this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNoSession', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
                         return false;
                     }
                 }
-                signUpResult = await this.requests.signUpFree(session);
+                signUpResult = await this.requests.signUpFree(sessions);
                 if (typeof signUpResult !== 'boolean' ) {
                     this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode, provider });
                 }
@@ -1170,11 +1278,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 const { confirmed } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        5128,
-                        "An error occurred while setting up Copilot. Would you like to try again?"
+                        5239,
+                        "An error occurred while setting up chat. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(5114, "Retry"))
+                    primaryButton: ( localize(5227, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstallWithRetry();
@@ -1184,7 +1292,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
     }
     async doInstall() {
-        await this.extensionsWorkbenchService.install(defaultChat.extensionId, {
+        await this.extensionsWorkbenchService.install(defaultChat.chatExtensionId, {
             enable: true,
             isApplicationScoped: true,
             isMachineScoped: false,
@@ -1214,6 +1322,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         if (options.useEnterpriseProvider) {
             const success = await this.handleEnterpriseInstance();
             if (!success) {
+                this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedEnterpriseSetup', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
                 return success;
             }
         }
@@ -1244,8 +1353,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(5129, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
-            placeHolder: ( localize(5130, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
+            prompt: ( localize(5240, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
+            placeHolder: ( localize(5241, 'i.e. "octocat" or "https://octocat.ghe.com"...')),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async (value) => {
@@ -1256,14 +1365,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(5131, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(5242, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            5132,
+                            5243,
                             'You must enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")',
                             defaultChat.provider.enterprise.name
                         )),
@@ -1310,4 +1419,4 @@ function refreshTokens(commandService) {
     commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
 }
 
-export { ChatSetupContribution };
+export { ChatSetupContribution, ChatTeardownContribution };