@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -42,7 +42,7 @@ import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { ExtensionUrlHandlerOverrideRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { CONTEXT_DEFAULT_ACCOUNT_STATE, DefaultAccountStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/accounts/browser/defaultAccount';
+import { CONTEXT_DEFAULT_ACCOUNT_STATE, DefaultAccountStatus } from '../../../../services/accounts/browser/defaultAccount.js';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
@@ -50,13 +50,14 @@ import { InEditorZenModeContext } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+import { UpdateTitleBarEditorVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/update/common/update';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatModeKind, ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ChatViewContainerId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatInputNotificationSeverity } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
+import { ChatInputNotificationSeverity } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
 import { IChatInputNotificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.service';
 import { chatViewsWelcomeRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
 import { ChatSetupAnonymous, buildUpgradeUrlWithRedirect, refreshTokens } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
@@ -64,6 +65,7 @@ import { ChatSetupController } from './chatSetupController.js';
 import { GrowthSessionController, registerGrowthSession } from './chatSetupGrowthSession.js';
 import { SetupAgent, AINewSymbolNamesProvider, ChatCodeActionsProvider, AICodeActionsHelper } from './chatSetupProviders.js';
 import { ChatSetup } from './chatSetupRunner.js';
+import { ChatAIDisabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/chatSettings';
 
 var ChatSetupExtensionUrlHandler_1;
 const defaultChat = {
@@ -229,7 +231,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     registerActions(context, requests, controller) {
         class ChatSetupTriggerAction extends Action2 {
             static {
-                this.CHAT_SETUP_ACTION_LABEL = ( localize2(7226, "Use AI Features with Copilot for free..."));
+                this.CHAT_SETUP_ACTION_LABEL = ( localize2(8455, "Use AI Features with Copilot for free..."));
             }
             constructor() {
                 super({
@@ -256,7 +258,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 await context.update({
                     hidden: false
                 });
-                configurationService.updateValue(ChatConfiguration.AIDisabled, false);
+                configurationService.updateValue(ChatAIDisabledSettingId, false);
                 if (mode) {
                     const chatWidget = await widgetService.revealWidget();
                     if (chatWidget) {
@@ -272,16 +274,20 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     chatWidget?.setInput(options.inputValue);
                 }
                 const setup = ChatSetup.getInstance(instantiationService, context, controller);
+                const result = await setup.run(options);
+                if (options?.returnResult) {
+                    return result;
+                }
                 const {
                     success
-                } = await setup.run(options);
-                if (success === false && !lifecycleService.willShutdown) {
+                } = result;
+                if (success === false && !result.errorAlreadyHandled && !lifecycleService.willShutdown) {
                     const {
                         confirmed
                     } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(7227, "Chat setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(7228, "Retry"))
+                        message: ( localize(8456, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(8457, "Retry"))
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -326,7 +332,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupForceSignIn",
-                    title: ( localize2(7229, "Sign in to use GitHub Copilot"))
+                    title: ( localize2(8458, "Sign in to use GitHub Copilot"))
                 });
             }
             async run(accessor) {
@@ -364,7 +370,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupFromAccounts",
-                    title: ( localize2(7230, "Sign in to use GitHub Copilot...")),
+                    title: ( localize2(8459, "Sign in to use GitHub Copilot...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: "2_copilot",
@@ -390,13 +396,13 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: ChatSetupSignInTitleBarAction.ID,
-                    title: ( localize(7231, "Sign In")),
+                    title: ( localize(8460, "Sign In")),
                     f1: false,
                     menu: [{
                         id: MenuId.TitleBarAdjacentCenter,
                         order: 0,
                         when: ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( CONTEXT_DEFAULT_ACCOUNT_STATE.notEqualsTo(DefaultAccountStatus.Available)), (
-                        ChatEntitlementContextKeys.hasByokModels.negate()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.TitleBarSignInEnabled}`, true)), ( ( ContextKeyExpr.has("updateTitleBar")).negate()), ( InEditorZenModeContext.negate())))
+                        ChatEntitlementContextKeys.hasByokModels.negate()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.TitleBarSignInEnabled}`, true)), ( UpdateTitleBarEditorVisibleContext.negate()), ( InEditorZenModeContext.negate())))
                     }]
                 });
             }
@@ -412,7 +418,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         }
         class ToggleSignInTitleBarAction extends ToggleTitleBarConfigAction {
             constructor() {
-                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(7232, "Copilot Sign In")), ( localize(7233, "Toggle visibility of the Copilot Sign In button in title bar")), 3, ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))));
+                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(8461, "Copilot Sign In")), ( localize(8462, "Toggle visibility of the Copilot Sign In button in title bar")), 3, ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))));
             }
         }
         const windowFocusListener = this._register(( new MutableDisposable()));
@@ -420,8 +426,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.upgradePlan",
-                    title: ( localize2(7234, "Upgrade to GitHub Copilot Pro")),
-                    category: ( localize2(7235, "Chat")),
+                    title: ( localize2(8463, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(8464, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.canSignUp,
@@ -471,8 +477,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.manageAdditionalSpend",
-                    title: ( localize2(7236, "Manage GitHub Copilot Budget")),
-                    category: ( localize2(7235, "Chat")),
+                    title: ( localize2(8465, "Manage GitHub Copilot Budget")),
+                    category: ( localize2(8464, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.planPro,
@@ -554,7 +560,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.explain",
-                title: ( localize(7237, "Explain"))
+                title: ( localize(8466, "Explain"))
             },
             group: "1_chat",
             order: 4,
@@ -563,7 +569,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.fix",
-                title: ( localize(7238, "Fix"))
+                title: ( localize(8467, "Fix"))
             },
             group: "1_chat",
             order: 5,
@@ -572,7 +578,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.review",
-                title: ( localize(7239, "Code Review"))
+                title: ( localize(8468, "Code Review"))
             },
             group: "1_chat",
             order: 6,
@@ -695,8 +701,8 @@ let ChatSetupExtensionUrlHandler = class ChatSetupExtensionUrlHandler {
         this.chatInputNotificationService.setNotification({
             id: ChatSetupExtensionUrlHandler_1.UPGRADE_SUCCESS_NOTIFICATION_ID,
             severity: ChatInputNotificationSeverity.Info,
-            message: ( localize(7240, "Upgrade Successful")),
-            description: ( localize(7241, "Please wait up to 10 minutes for your new plan to apply.")),
+            message: ( localize(8469, "Upgrade Successful")),
+            description: ( localize(8470, "Please wait up to 10 minutes for your new plan to apply.")),
             actions: [],
             dismissible: true,
             autoDismissOnMessage: true
@@ -732,7 +738,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
         this.handleChatDisabled(false);
     }
     handleChatDisabled(fromEvent) {
-        const chatDisabled = this.configurationService.inspect(ChatConfiguration.AIDisabled);
+        const chatDisabled = this.configurationService.inspect(ChatAIDisabledSettingId);
         if (chatDisabled.value === true) {
             this.maybeEnableOrDisableExtension(
                 typeof chatDisabled.workspaceValue === "boolean" ? EnablementState.DisabledWorkspace : EnablementState.DisabledGlobally
@@ -746,7 +752,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
     }
     async registerListeners() {
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (!e.affectsConfiguration(ChatConfiguration.AIDisabled)) {
+            if (!e.affectsConfiguration(ChatAIDisabledSettingId)) {
                 return;
             }
             this.handleChatDisabled(true);
@@ -761,11 +767,11 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
             );
             if (defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local)) {
                 if (defaultChatExtension.enablementState === EnablementState.EnabledWorkspace) {
-                    if (this.configurationService.inspect(ChatConfiguration.AIDisabled).workspaceValue === true) {
-                        this.configurationService.updateValue(ChatConfiguration.AIDisabled, false, ConfigurationTarget.WORKSPACE);
+                    if (this.configurationService.inspect(ChatAIDisabledSettingId).workspaceValue === true) {
+                        this.configurationService.updateValue(ChatAIDisabledSettingId, false, ConfigurationTarget.WORKSPACE);
                     }
                 } else {
-                    this.configurationService.updateValue(ChatConfiguration.AIDisabled, false);
+                    this.configurationService.updateValue(ChatAIDisabledSettingId, false);
                 }
             }
         }));
@@ -784,7 +790,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
         }
         await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
         await this.extensionsWorkbenchService.updateRunningExtensions(
-            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(7242, "Enabling AI features")) : ( localize(7243, "Disabling AI features"))
+            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(8471, "Enabling AI features")) : ( localize(8472, "Disabling AI features"))
         );
     }
     maybeHideAuxiliaryBar() {
@@ -802,7 +808,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 this.ID = "workbench.action.chat.hideSetup";
             }
             static {
-                this.TITLE = ( localize2(7244, "Learn How to Hide AI Features"));
+                this.TITLE = ( localize2(8473, "Learn How to Hide AI Features"));
             }
             constructor() {
                 super({
@@ -823,7 +829,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 const preferencesService = accessor.get(IPreferencesService);
                 preferencesService.openSettings({
                     jsonEditor: false,
-                    query: `@id:${ChatConfiguration.AIDisabled}`
+                    query: `@id:${ChatAIDisabledSettingId}`
                 });
             }
         }

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.d.ts

@@ -1,3 +1,4 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -19,6 +20,7 @@ export interface IChatSetupControllerOptions {
     readonly useEnterpriseProvider?: boolean;
     readonly additionalScopes?: readonly string[];
     readonly forceAnonymous?: ChatSetupAnonymous;
+    readonly cancellationToken?: CancellationToken;
 }
 export declare class ChatSetupController extends Disposable {
     private readonly context;

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

@@ -1,5 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { raceCancellation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -27,7 +29,7 @@ import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode
 import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { CHAT_OPEN_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ChatViewContainerId, ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatSetupStep, maybeEnableAuthExtension, refreshTokens } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
+import { ChatSetupStep, maybeEnableAuthExtension, refreshTokens, ChatSetupError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
 import { IDefaultAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 
@@ -49,6 +51,10 @@ const defaultChat = {
         google: {
             id: "",
             name: ""
+        },
+        microsoft: {
+            id: "",
+            name: ""
         }
     },
     providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? "",
@@ -106,7 +112,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options = {}) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(7245, "Getting chat ready..."));
+        const title = ( localize(8474, "Getting chat ready..."));
         const badge = this.activityService.showViewContainerActivity(ChatViewContainerId, {
             badge: ( new ProgressBadge(() => title))
         });
@@ -121,6 +127,9 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
     }
     async doSetup(options, watch) {
+        if (options.cancellationToken?.isCancellationRequested) {
+            return undefined;
+        }
         this.context.suspend();
         let success = false;
         try {
@@ -140,6 +149,9 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             if (signIn) {
                 this.setStep(ChatSetupStep.SigningIn);
                 const result = await this.signIn(options);
+                if (!result) {
+                    return undefined;
+                }
                 if (!result.defaultAccount) {
                     const provider = options.useSocialProvider ?? (options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id);
                     this.telemetryService.publicLog2("commandCenter.chatInstall", {
@@ -152,6 +164,9 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 }
                 entitlement = result.entitlement;
             }
+            if (options.cancellationToken?.isCancellationRequested) {
+                return undefined;
+            }
             this.setStep(ChatSetupStep.Installing);
             success = await this.install(entitlement ?? this.context.state.entitlement, watch, options);
         } finally {
@@ -165,15 +180,30 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         if (authExtensionReEnabled) {
             refreshTokens(this.commandService);
         }
+        if (options.cancellationToken?.isCancellationRequested) {
+            return undefined;
+        }
         let entitlements;
         let defaultAccount;
+        let signInError;
         try {
+            const result = await raceCancellation(
+                this.requests.signIn(options),
+                options.cancellationToken ?? CancellationToken.None
+            );
+            if (!result) {
+                return undefined;
+            }
             ({
                 defaultAccount,
                 entitlements
-            } = await this.requests.signIn(options));
+            } = result);
         } catch (e) {
             this.logService.error(`[chat setup] signIn: error ${e}`);
+            signInError = e instanceof Error ? e : ( new Error(String(e)));
+        }
+        if (options.cancellationToken?.isCancellationRequested) {
+            return undefined;
         }
         if (!defaultAccount && !this.lifecycleService.willShutdown) {
             const {
@@ -181,17 +211,20 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    7246,
+                    8475,
                     "Failed to sign in to {0}. Would you like to try again?",
                     this.defaultAccountService.getDefaultAccountAuthenticationProvider().name
                 )),
-                detail: ( localize(7247, "You must be signed in to use AI features.")),
-                primaryButton: ( localize(7248, "Retry"))
+                detail: ( localize(8476, "You must be signed in to use AI features.")),
+                primaryButton: ( localize(8477, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(options);
             }
         }
+        if (signInError) {
+            throw ( new ChatSetupError(signInError, true));
+        }
         return {
             defaultAccount,
             entitlement: entitlements?.entitlement
@@ -267,11 +300,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        7249,
+                        8478,
                         "An error occurred while setting up chat. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(7248, "Retry"))
+                    primaryButton: ( localize(8477, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstallWithRetry();
@@ -290,6 +323,9 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }, ChatViewId);
     }
     async setupWithProvider(options) {
+        if (options.cancellationToken?.isCancellationRequested) {
+            return undefined;
+        }
         const registry = ( Registry.as(Extensions.Configuration));
         registry.registerConfiguration({
             "id": "copilot.setup",
@@ -320,6 +356,9 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 return success;
             }
         }
+        if (options.cancellationToken?.isCancellationRequested) {
+            return undefined;
+        }
         let existingAdvancedSetting = this.configurationService.inspect(defaultChat.completionsAdvancedSetting).user?.value;
         if (!isObject(existingAdvancedSetting)) {
             existingAdvancedSetting = {};
@@ -349,8 +388,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(7250, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
-            placeHolder: ( localize(7251, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
+            prompt: ( localize(8479, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
+            placeHolder: ( localize(8480, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async value => {
@@ -361,14 +400,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(7252, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(8481, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            7253,
+                            8482,
                             "You must enter a valid {0} instance (i.e. \"octocat\" or \"https://octocat.ghe.com\")",
                             defaultChat.provider.enterprise.name
                         )),

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

@@ -62,8 +62,8 @@ let GrowthSessionController = class GrowthSessionController extends Disposable {
         }
         return [{
             resource: GrowthSessionController_1.SESSION_URI,
-            label: ( localize(7254, "Try Copilot")),
-            description: ( localize(7255, "GitHub Copilot is available. Try it for free.")),
+            label: ( localize(8483, "Try Copilot")),
+            description: ( localize(8484, "GitHub Copilot is available. Try it for free.")),
             status: ChatSessionStatus.NeedsInput,
             iconPath: Codicon.lightbulb,
             timing: {
@@ -103,9 +103,9 @@ class GrowthSessionOpenerParticipant {
             query: "",
             isPartialQuery: true,
             previousRequests: [{
-                request: ( localize(7256, "Tell me about GitHub Copilot!")),
+                request: ( localize(8485, "Tell me about GitHub Copilot!")),
                 response: ( localize(
-                    7257,
+                    8486,
                     "Welcome to GitHub Copilot, your AI coding assistant! Here are some things you can try:\n\n- 🐛 *\"Help me debug this error\"* — paste an error message and get a fix\n- 🧪 *\"Write tests for my function\"* — select code and ask for unit tests\n- 💡 *\"Explain this code\"* — highlight something unfamiliar and ask what it does\n- 🚀 *\"Scaffold a REST API\"* — describe what you want and let Agent mode build it\n- 🎨 *\"Refactor this to be more readable\"* — select messy code and clean it up\n\nType anything below to get started!"
                 ))
             }]
@@ -126,8 +126,8 @@ registerAction2(class ResetGrowthSessionAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.resetGrowthSession",
-            title: ( localize2(7258, "Reset Growth Session Notification")),
-            category: ( localize2(7259, "Developer")),
+            title: ( localize2(8487, "Reset Growth Session Notification")),
+            category: ( localize2(8488, "Developer")),
             f1: true
         });
     }