@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

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

@@ -30,6 +30,7 @@ import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { ToggleTitleBarConfigAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/titlebar/titlebarActions';
 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 { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
@@ -41,11 +42,11 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 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';
+import { InEditorZenModeContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 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';
@@ -60,9 +61,8 @@ import { ChatSetup } from './chatSetupRunner.js';
 
 const defaultChat = {
     chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? "",
-    manageOveragesUrl: product.defaultChatAgent?.manageOverageUrl ?? "",
+    manageOverageUrl: product.defaultChatAgent?.manageOverageUrl ?? "",
     upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? "",
-    completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? "",
     chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? ""
 };
 const SIGN_IN_TITLE_BAR_ACTION_ID = "workbench.action.chat.signInIndicator";
@@ -225,7 +225,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     registerActions(context, requests, controller) {
         class ChatSetupTriggerAction extends Action2 {
             static {
-                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6301, "Use AI Features with Copilot for free..."));
+                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6533, "Use AI Features with Copilot for free..."));
             }
             constructor() {
                 super({
@@ -255,7 +255,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 configurationService.updateValue(ChatConfiguration.AIDisabled, false);
                 if (mode) {
                     const chatWidget = await widgetService.revealWidget();
-                    chatWidget?.input.setChatMode(mode);
+                    if (chatWidget) {
+                        const resolvedMode = this.resolveAgentId(mode, chatWidget);
+                        if (resolvedMode) {
+                            chatWidget.input.setChatMode(resolvedMode);
+                        }
+                    }
                 }
                 if (options?.inputValue) {
                     const chatWidget = await widgetService.revealWidget();
@@ -271,8 +276,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         confirmed
                     } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(6302, "Chat setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(6303, "Retry"))
+                        message: ( localize(6534, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(6535, "Retry"))
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -280,6 +285,17 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 }
                 return Boolean(success);
             }
+            resolveAgentId(agentParam, chatWidget) {
+                const modes = chatWidget.input.currentChatModesObs.get();
+                const foundAgent = modes.findModeById(agentParam);
+                if (foundAgent) {
+                    return foundAgent.id;
+                }
+                const allAgents = [...modes.builtin, ...modes.custom];
+                const nameLower = agentParam.toLowerCase();
+                const agentByName = allAgents.find(agent => agent.name.get().toLowerCase() === nameLower);
+                return agentByName?.id;
+            }
         }
         class ChatSetupTriggerSupportAnonymousAction extends Action2 {
             constructor() {
@@ -306,7 +322,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupForceSignIn",
-                    title: ( localize2(6304, "Sign in to use AI features"))
+                    title: ( localize2(6536, "Sign in to use AI features"))
                 });
             }
             async run(accessor) {
@@ -344,7 +360,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupFromAccounts",
-                    title: ( localize2(6305, "Sign in to use AI features...")),
+                    title: ( localize2(6537, "Sign in to use AI features...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: "2_copilot",
@@ -369,12 +385,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: ChatSetupSignInTitleBarAction.ID,
-                    title: ( localize(6306, "Sign In")),
+                    title: ( localize(6538, "Sign In")),
                     f1: false,
                     menu: [{
                         id: MenuId.TitleBarAdjacentCenter,
                         order: 0,
-                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ( ContextKeyExpr.has(`config.${ChatConfiguration.SignInTitleBarEnabled}`)), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ( ContextKeyExpr.has("updateTitleBar")).negate())))
+                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.TitleBarSignInEnabled}`, true)), ( ( ContextKeyExpr.has("updateTitleBar")).negate()), ( InEditorZenModeContext.negate())))
                     }]
                 });
             }
@@ -388,13 +404,18 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 return commandService.executeCommand(CHAT_SETUP_ACTION_ID);
             }
         }
+        class ToggleSignInTitleBarAction extends ToggleTitleBarConfigAction {
+            constructor() {
+                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(6539, "Copilot Sign In")), ( localize(6540, "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()));
         class UpgradePlanAction extends Action2 {
             constructor() {
                 super({
                     id: "workbench.action.chat.upgradePlan",
-                    title: ( localize2(6307, "Upgrade to GitHub Copilot Pro")),
-                    category: ( localize2(6308, "Chat")),
+                    title: ( localize2(6541, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(6542, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.canSignUp,
@@ -415,6 +436,11 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const openerService = accessor.get(IOpenerService);
                 const hostService = accessor.get(IHostService);
                 const commandService = accessor.get(ICommandService);
+                const telemetryService = accessor.get(ITelemetryService);
+                telemetryService.publicLog2("workbenchActionExecuted", {
+                    id: "workbench.action.chat.upgradePlan",
+                    from: "command"
+                });
                 openerService.open(( URI.parse(defaultChat.upgradePlanUrl)));
                 const entitlement = context.state.entitlement;
                 if (!isProUser(entitlement)) {
@@ -431,16 +457,17 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 }
             }
         }
-        class EnableOveragesAction extends Action2 {
+        class ManageAdditionalSpendAction extends Action2 {
             constructor() {
                 super({
-                    id: "workbench.action.chat.manageOverages",
-                    title: ( localize2(6309, "Manage GitHub Copilot Overages")),
-                    category: ( localize2(6308, "Chat")),
+                    id: "workbench.action.chat.manageAdditionalSpend",
+                    title: ( localize2(6543, "Manage GitHub Copilot Additional Spend")),
+                    category: ( localize2(6542, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.planPro,
                         ChatContextKeys.Entitlement.planProPlus,
+                        ChatContextKeys.Entitlement.planMax,
                         ChatContextKeys.Entitlement.planEdu
                     )))),
                     menu: {
@@ -450,6 +477,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.or(
                             ChatContextKeys.Entitlement.planPro,
                             ChatContextKeys.Entitlement.planProPlus,
+                            ChatContextKeys.Entitlement.planMax,
                             ChatContextKeys.Entitlement.planEdu
                         )), ( ContextKeyExpr.or(
                             ChatContextKeys.chatQuotaExceeded,
@@ -460,17 +488,23 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             }
             async run(accessor) {
                 const openerService = accessor.get(IOpenerService);
-                openerService.open(( URI.parse(defaultChat.manageOveragesUrl)));
+                const telemetryService = accessor.get(ITelemetryService);
+                telemetryService.publicLog2("workbenchActionExecuted", {
+                    id: "workbench.action.chat.manageAdditionalSpend",
+                    from: "command"
+                });
+                openerService.open(( URI.parse(defaultChat.manageOverageUrl)));
             }
         }
         registerAction2(ChatSetupTriggerAction);
         registerAction2(ChatSetupTriggerForceSignInDialogAction);
         registerAction2(ChatSetupFromAccountsAction);
         registerAction2(ChatSetupSignInTitleBarAction);
+        registerAction2(ToggleSignInTitleBarAction);
         registerAction2(ChatSetupTriggerAnonymousWithoutDialogAction);
         registerAction2(ChatSetupTriggerSupportAnonymousAction);
         registerAction2(UpgradePlanAction);
-        registerAction2(EnableOveragesAction);
+        registerAction2(ManageAdditionalSpendAction);
         function registerGenerateCodeCommand(coreCommand, actualCommand) {
             CommandsRegistry.registerCommand(coreCommand, async (accessor, ...args) => {
                 const commandService = accessor.get(ICommandService);
@@ -514,7 +548,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.explain",
-                title: ( localize(6310, "Explain"))
+                title: ( localize(6544, "Explain"))
             },
             group: "1_chat",
             order: 4,
@@ -523,7 +557,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.fix",
-                title: ( localize(6311, "Fix"))
+                title: ( localize(6545, "Fix"))
             },
             group: "1_chat",
             order: 5,
@@ -532,7 +566,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.review",
-                title: ( localize(6312, "Code Review"))
+                title: ( localize(6546, "Code Review"))
             },
             group: "1_chat",
             order: 6,
@@ -603,11 +637,10 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
 };
 ChatSetupContribution = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IInstantiationService)), ( __param(2, IChatEntitlementService)), ( __param(3, ILogService)), ( __param(4, IContextKeyService)), ( __param(5, IWorkbenchExtensionEnablementService)), ( __param(6, IExtensionsWorkbenchService)), ( __param(7, IExtensionService)), ( __param(8, IEnvironmentService)), ( __param(9, IChatSessionsService)), ( __param(10, IConfigurationService))], ChatSetupContribution));
 let ChatSetupExtensionUrlHandler = class ChatSetupExtensionUrlHandler {
-    constructor(productService, commandService, telemetryService, chatModeService) {
+    constructor(productService, commandService, telemetryService) {
         this.productService = productService;
         this.commandService = commandService;
         this.telemetryService = telemetryService;
-        this.chatModeService = chatModeService;
     }
     canHandleURL(url) {
         return url.scheme === this.productService.urlProtocol && equalsIgnoreCase(url.authority, defaultChat.chatExtensionId);
@@ -624,25 +657,13 @@ let ChatSetupExtensionUrlHandler = class ChatSetupExtensionUrlHandler {
         if (!agentParam && !inputParam) {
             return false;
         }
-        const agentId = agentParam ? this.resolveAgentId(agentParam) : undefined;
-        await this.commandService.executeCommand(CHAT_SETUP_ACTION_ID, agentId, inputParam ? {
+        await this.commandService.executeCommand(CHAT_SETUP_ACTION_ID, agentParam, inputParam ? {
             inputValue: inputParam
         } : undefined);
         return true;
     }
-    resolveAgentId(agentParam) {
-        const agents = this.chatModeService.getModes();
-        const allAgents = [...agents.builtin, ...agents.custom];
-        const foundAgent = allAgents.find(agent => agent.id === agentParam);
-        if (foundAgent) {
-            return foundAgent.id;
-        }
-        const nameLower = agentParam.toLowerCase();
-        const agentByName = allAgents.find(agent => agent.name.get().toLowerCase() === nameLower);
-        return agentByName?.id;
-    }
 };
-ChatSetupExtensionUrlHandler = ( __decorate([( __param(0, IProductService)), ( __param(1, ICommandService)), ( __param(2, ITelemetryService)), ( __param(3, IChatModeService))], ChatSetupExtensionUrlHandler));
+ChatSetupExtensionUrlHandler = ( __decorate([( __param(0, IProductService)), ( __param(1, ICommandService)), ( __param(2, ITelemetryService))], ChatSetupExtensionUrlHandler));
 let ChatTeardownContribution = class ChatTeardownContribution extends Disposable {
     static {
         this.ID = "workbench.contrib.chatTeardown";
@@ -717,7 +738,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
         }
         await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
         await this.extensionsWorkbenchService.updateRunningExtensions(
-            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6313, "Enabling AI features")) : ( localize(6314, "Disabling AI features"))
+            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6547, "Enabling AI features")) : ( localize(6548, "Disabling AI features"))
         );
     }
     maybeHideAuxiliaryBar() {
@@ -735,7 +756,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 this.ID = "workbench.action.chat.hideSetup";
             }
             static {
-                this.TITLE = ( localize2(6315, "Learn How to Hide AI Features"));
+                this.TITLE = ( localize2(6549, "Learn How to Hide AI Features"));
             }
             constructor() {
                 super({
@@ -765,7 +786,6 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
 };
 ChatTeardownContribution = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, IConfigurationService)), ( __param(2, IExtensionsWorkbenchService)), ( __param(3, IWorkbenchExtensionEnablementService)), ( __param(4, IViewDescriptorService)), ( __param(5, IWorkbenchLayoutService))], ChatTeardownContribution));
 function refreshTokens(commandService) {
-    commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);
     commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
 }
 class SignInTitleBarEntry extends BaseActionViewItem {

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

@@ -106,7 +106,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options = {}) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(6316, "Getting chat ready..."));
+        const title = ( localize(6550, "Getting chat ready..."));
         const badge = this.activityService.showViewContainerActivity(ChatViewContainerId, {
             badge: ( new ProgressBadge(() => title))
         });
@@ -181,12 +181,12 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    6317,
+                    6551,
                     "Failed to sign in to {0}. Would you like to try again?",
                     this.defaultAccountService.getDefaultAccountAuthenticationProvider().name
                 )),
-                detail: ( localize(6318, "You must be signed in to use AI features.")),
-                primaryButton: ( localize(6319, "Retry"))
+                detail: ( localize(6552, "You must be signed in to use AI features.")),
+                primaryButton: ( localize(6553, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(options);
@@ -267,11 +267,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        6320,
+                        6554,
                         "An error occurred while setting up chat. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(6319, "Retry"))
+                    primaryButton: ( localize(6553, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstallWithRetry();
@@ -349,8 +349,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(6321, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
-            placeHolder: ( localize(6322, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
+            prompt: ( localize(6555, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
+            placeHolder: ( localize(6556, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async value => {
@@ -361,14 +361,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(6323, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(6557, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            6324,
+                            6558,
                             "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(6325, "Try Copilot")),
-            description: ( localize(6326, "GitHub Copilot is available. Try it for free.")),
+            label: ( localize(6559, "Try Copilot")),
+            description: ( localize(6560, "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(6327, "Tell me about GitHub Copilot!")),
+                request: ( localize(6561, "Tell me about GitHub Copilot!")),
                 response: ( localize(
-                    6328,
+                    6562,
                     "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(6329, "Reset Growth Session Notification")),
-            category: ( localize2(6330, "Developer")),
+            title: ( localize2(6563, "Reset Growth Session Notification")),
+            category: ( localize2(6564, "Developer")),
             f1: true
         });
     }

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

@@ -138,7 +138,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(6331, "Ask questions about VS Code")).value,
+                ( localize2(6565, "Ask questions about VS Code")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -153,7 +153,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.workspace",
                 "workspace",
                 false,
-                ( localize2(6332, "Ask about your workspace")).value,
+                ( localize2(6566, "Ask about your workspace")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -168,7 +168,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.terminal.agent",
                 "terminal",
                 false,
-                ( localize2(6333, "Ask how to do something in the terminal")).value,
+                ( localize2(6567, "Ask how to do something in the terminal")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -179,9 +179,9 @@ let SetupAgent = class SetupAgent extends Disposable {
                 id: "setup_tools_createNewWorkspace",
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(6334, "New Workspace")),
+                displayName: ( localize(6568, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(6335, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(6569, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: "new",
                 when: ContextKeyExpr.true()
@@ -236,10 +236,10 @@ let SetupAgent = class SetupAgent extends Disposable {
         };
     }
     static {
-        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6336, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6570, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6337, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6571, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
@@ -382,7 +382,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(6338, "Getting chat ready")))),
+            content: ( new MarkdownString(( localize(6572, "Getting chat ready")))),
             shimmer: true
         });
         await this.forwardRequestToChat(
@@ -419,7 +419,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             this.logService.error("[chat setup] Failed to forward request to chat", error);
             progress({
                 kind: "warning",
-                content: ( new MarkdownString(( localize(6339, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(6573, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -488,7 +488,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6340, "Chat is almost ready")))),
+                    content: ( new MarkdownString(( localize(6574, "Chat is almost ready")))),
                     shimmer: true
                 });
             }, 10000);
@@ -505,7 +505,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                     this.environmentService.remoteAuthority ? 60000  : 20000
                 ).then(() => "timedout"), this.whenPanelAgentHasGuidance(disposables).then(() => "panelGuidance"), allReady]);
                 if (ready === "panelGuidance") {
-                    const warningMessage = ( localize(6341, "Please try again."));
+                    const warningMessage = ( localize(6575, "Please try again."));
                     progress({
                         kind: "markdownContent",
                         content: ( new MarkdownString(warningMessage))
@@ -517,13 +517,13 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            6342,
+                            6576,
                             "Chat took too long to get ready. Please ensure that the extension `{0}` is installed and enabled. Click restart to try again if this issue persists.",
                             defaultChat.chatExtensionId
                         ));
                     } else {
                         warningMessage = ( localize(
-                            6343,
+                            6577,
                             "Chat took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled. Click restart to try again if this issue persists.",
                             defaultChat.provider.default.name,
                             defaultChat.chatExtensionId
@@ -550,7 +550,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
-                                title: ( localize(6344, "Show Details"))
+                                title: ( localize(6578, "Show Details"))
                             }
                         });
                     } else {
@@ -561,7 +561,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                                title: ( localize(6345, "Restart")),
+                                title: ( localize(6579, "Restart")),
                                 arguments: [requestModel.session.sessionResource]
                             }
                         });
@@ -588,7 +588,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         await chatService.resendRequest(requestModel, {
             ...widget?.getModeRequestOptions(),
             modeInfo,
-            userSelectedModelId: widget?.input.currentLanguageModel
+            userSelectedModelId: widget?.input?.currentLanguageModel
         });
     }
     async whenPanelAgentHasGuidance(disposables) {
@@ -739,7 +739,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        6346,
+                        6580,
                         "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
                     )))),
@@ -749,7 +749,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6347, "Getting chat ready")))),
+                    content: ( new MarkdownString(( localize(6581, "Getting chat ready")))),
                     shimmer: true
                 });
                 break;
@@ -786,7 +786,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(6348, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(6582, "Chat setup failed."))))
                 });
             }
         }
@@ -940,13 +940,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(6349, "Generate"));
+                generateOrModifyTitle = ( localize(6583, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(6350, "Modify"));
+                generateOrModifyTitle = ( localize(6584, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -964,14 +964,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6351, "Fix")),
+                title: ( localize(6585, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6352, "Explain")),
+                title: ( localize(6586, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -994,7 +994,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6350, "Modify")),
+            title: ( localize(6584, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1005,7 +1005,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6349, "Generate")),
+            title: ( localize(6583, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1024,7 +1024,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(6352, "Explain")),
+            title: ( localize(6586, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -1034,7 +1034,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(6351, "Fix")),
+            title: ( localize(6585, "Fix")),
             arguments: [{
                 message: `/fix ${( markers.map(marker => marker.message)).join(", ")}`,
                 initialSelection: this.rangeToSelection(range),

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

@@ -32,6 +32,8 @@ export declare class ChatSetup {
         dialogIcon?: ThemeIcon;
         dialogTitle?: string;
         setupStrategy?: ChatSetupStrategy;
+        disableCloseButton?: boolean;
+        onSignInStarted?: () => void;
     }): Promise<IChatSetupResult>;
     private doRun;
     private showDialog;