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

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

@@ -15,7 +15,6 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/conf
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 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 { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
@@ -28,8 +27,9 @@ 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 './chatSetup.js';
+import { ChatSetupStep, maybeEnableAuthExtension, refreshTokens } 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';
 
 const defaultChat = {
     chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? "",
@@ -63,7 +63,6 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         requests,
         telemetryService,
         extensionsWorkbenchService,
-        productService,
         logService,
         progressService,
         activityService,
@@ -72,14 +71,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         configurationService,
         lifecycleService,
         quickInputService,
-        defaultAccountService
+        defaultAccountService,
+        productService
     ) {
         super();
         this.context = context;
         this.requests = requests;
         this.telemetryService = telemetryService;
         this.extensionsWorkbenchService = extensionsWorkbenchService;
-        this.productService = productService;
         this.logService = logService;
         this.progressService = progressService;
         this.activityService = activityService;
@@ -89,6 +88,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         this.lifecycleService = lifecycleService;
         this.quickInputService = quickInputService;
         this.defaultAccountService = defaultAccountService;
+        this.productService = productService;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._step = ChatSetupStep.Initial;
@@ -106,7 +106,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options = {}) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(6256, "Getting chat ready..."));
+        const title = ( localize(6316, "Getting chat ready..."));
         const badge = this.activityService.showViewContainerActivity(ChatViewContainerId, {
             badge: ( new ProgressBadge(() => title))
         });
@@ -141,7 +141,6 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 this.setStep(ChatSetupStep.SigningIn);
                 const result = await this.signIn(options);
                 if (!result.defaultAccount) {
-                    this.doInstall();
                     const provider = options.useSocialProvider ?? (options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id);
                     this.telemetryService.publicLog2("commandCenter.chatInstall", {
                         installResult: "failedNotSignedIn",
@@ -182,12 +181,12 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    6257,
+                    6317,
                     "Failed to sign in to {0}. Would you like to try again?",
                     this.defaultAccountService.getDefaultAccountAuthenticationProvider().name
                 )),
-                detail: ( localize(6258, "You must be signed in to use AI features.")),
-                primaryButton: ( localize(6259, "Retry"))
+                detail: ( localize(6318, "You must be signed in to use AI features.")),
+                primaryButton: ( localize(6319, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(options);
@@ -199,7 +198,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         };
     }
     async install(entitlement, watch, options) {
-        const wasRunning = this.context.state.installed && !this.context.state.disabled;
+        const wasRunning = this.context.state.completed && !this.context.state.disabled;
         let signUpResult = undefined;
         let provider;
         if (options.forceAnonymous && entitlement === ChatEntitlement.Unknown) {
@@ -268,11 +267,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        6260,
+                        6320,
                         "An error occurred while setting up chat. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(6259, "Retry"))
+                    primaryButton: ( localize(6319, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstallWithRetry();
@@ -350,8 +349,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(6261, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
-            placeHolder: ( localize(6262, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
+            prompt: ( localize(6321, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
+            placeHolder: ( localize(6322, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async value => {
@@ -362,14 +361,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(6263, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(6323, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            6264,
+                            6324,
                             "You must enter a valid {0} instance (i.e. \"octocat\" or \"https://octocat.ghe.com\")",
                             defaultChat.provider.enterprise.name
                         )),
@@ -396,6 +395,6 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         return true;
     }
 };
-ChatSetupController = ( __decorate([( __param(2, ITelemetryService)), ( __param(3, IExtensionsWorkbenchService)), ( __param(4, IProductService)), ( __param(5, ILogService)), ( __param(6, IProgressService)), ( __param(7, IActivityService)), ( __param(8, ICommandService)), ( __param(9, IDialogService)), ( __param(10, IConfigurationService)), ( __param(11, ILifecycleService)), ( __param(12, IQuickInputService)), ( __param(13, IDefaultAccountService))], ChatSetupController));
+ChatSetupController = ( __decorate([( __param(2, ITelemetryService)), ( __param(3, IExtensionsWorkbenchService)), ( __param(4, ILogService)), ( __param(5, IProgressService)), ( __param(6, IActivityService)), ( __param(7, ICommandService)), ( __param(8, IDialogService)), ( __param(9, IConfigurationService)), ( __param(10, ILifecycleService)), ( __param(11, IQuickInputService)), ( __param(12, IDefaultAccountService)), ( __param(13, IProductService))], ChatSetupController));
 
 export { ChatSetupController };

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(6265, "Try Copilot")),
-            description: ( localize(6266, "GitHub Copilot is available. Try it for free.")),
+            label: ( localize(6325, "Try Copilot")),
+            description: ( localize(6326, "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(6267, "Tell me about GitHub Copilot!")),
+                request: ( localize(6327, "Tell me about GitHub Copilot!")),
                 response: ( localize(
-                    6268,
+                    6328,
                     "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(6269, "Reset Growth Session Notification")),
-            category: ( localize2(6270, "Developer")),
+            title: ( localize2(6329, "Reset Growth Session Notification")),
+            category: ( localize2(6330, "Developer")),
             f1: true
         });
     }

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

@@ -67,6 +67,7 @@ export declare class SetupAgent extends Disposable implements IChatAgentImplemen
     private whenToolsModelReady;
     private whenAgentReady;
     private whenAgentActivated;
+    private computeDiagnosticInfo;
     private doInvokeWithSetup;
     private replaceAgentInRequestModel;
     private replaceToolInRequestModel;

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

@@ -39,7 +39,7 @@ import { ACTION_START } from '@codingame/monaco-vscode-katex-common/vscode/vs/wo
 import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
 import { markChatGlobal, ChatGlobalPerfMark } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatPerf';
-import { maybeEnableAuthExtension, refreshTokens, ChatSetupStep, ChatSetupAnonymous } from './chatSetup.js';
+import { maybeEnableAuthExtension, refreshTokens, ChatSetupStep, ChatSetupAnonymous } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
 import { ChatSetup } from './chatSetupRunner.js';
 import { chatViewsWelcomeRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
@@ -138,7 +138,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(6271, "Ask questions about VS Code")).value,
+                ( localize2(6331, "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(6272, "Ask about your workspace")).value,
+                ( localize2(6332, "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(6273, "Ask how to do something in the terminal")).value,
+                ( localize2(6333, "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(6274, "New Workspace")),
+                displayName: ( localize(6334, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(6275, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(6335, "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(6276, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6336, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6277, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6337, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
@@ -342,7 +342,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         defaultAccountService
     ) {
         if (
-        !this.context.state.installed || this.context.state.disabled || this.context.state.untrusted || this.context.state.entitlement === ChatEntitlement.Available ||
+        !this.context.state.completed || this.context.state.disabled || this.context.state.untrusted || this.context.state.entitlement === ChatEntitlement.Available ||
         (
         this.context.state.entitlement === ChatEntitlement.Unknown && !this.chatEntitlementService.anonymous)) {
             return this.doInvokeWithSetup(
@@ -382,7 +382,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(6278, "Getting chat ready")))),
+            content: ( new MarkdownString(( localize(6338, "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(6279, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(6339, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -488,23 +488,24 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6280, "Chat is almost ready")))),
+                    content: ( new MarkdownString(( localize(6340, "Chat is almost ready")))),
                     shimmer: true
                 });
             }, 10000);
             const disposables = ( new DisposableStore());
             disposables.add(toDisposable(() => clearTimeout(timeoutHandle)));
             try {
-                const ready = await Promise.race([timeout(
-                    this.environmentService.remoteAuthority ? 60000  : 20000
-                ).then(() => "timedout"), this.whenPanelAgentHasGuidance(disposables).then(() => "panelGuidance"), Promise.allSettled([
+                const allReady = Promise.allSettled([
                     whenAgentActivated,
                     whenAgentReady,
                     whenLanguageModelReady,
                     whenToolsModelReady
-                ])]);
+                ]);
+                const ready = await Promise.race([timeout(
+                    this.environmentService.remoteAuthority ? 60000  : 20000
+                ).then(() => "timedout"), this.whenPanelAgentHasGuidance(disposables).then(() => "panelGuidance"), allReady]);
                 if (ready === "panelGuidance") {
-                    const warningMessage = ( localize(6281, "Please try again."));
+                    const warningMessage = ( localize(6341, "Please try again."));
                     progress({
                         kind: "markdownContent",
                         content: ( new MarkdownString(warningMessage))
@@ -516,70 +517,30 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            6282,
+                            6342,
                             "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(
-                            6283,
+                            6343,
                             "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
                         ));
                     }
-                    const languageModelIds = languageModelsService.getLanguageModelIds();
-                    let languageModelDefaultCount = 0;
-                    for (const id of languageModelIds) {
-                        const model = languageModelsService.lookupLanguageModel(id);
-                        if (model?.isDefaultForLocation[ChatAgentLocation.Chat]) {
-                            languageModelDefaultCount++;
-                        }
-                    }
-                    const defaultAgent = chatAgentService.getDefaultAgent(this.location, modeInfo?.kind);
-                    const agentHasDefault = !!defaultAgent;
-                    const agentDefaultIsCore = defaultAgent?.isCore ?? false;
-                    const contributedDefaultAgent = chatAgentService.getContributedDefaultAgent(this.location);
-                    const agentHasContributedDefault = !!contributedDefaultAgent;
-                    const agentContributedDefaultIsCore = contributedDefaultAgent?.isCore ?? false;
-                    const agentActivatedCount = chatAgentService.getActivatedAgents().length;
-                    this.logService.warn(warningMessage, {
-                        agentActivated,
-                        agentReady,
-                        agentHasDefault,
-                        agentDefaultIsCore,
-                        agentHasContributedDefault,
-                        agentContributedDefaultIsCore,
-                        agentActivatedCount,
-                        agentLocation: this.location,
-                        agentModeKind: modeInfo?.kind,
-                        languageModelReady,
-                        languageModelCount: languageModelIds.length,
-                        languageModelDefaultCount,
-                        languageModelHasRequestedModel: !!requestModel.modelId,
-                        toolsModelReady
-                    });
-                    const chatViewPane = this.viewsService.getActiveViewWithId(ChatViewId);
-                    const matchingWelcomeView = chatViewPane?.getMatchingWelcomeView();
-                    this.telemetryService.publicLog2("chatSetup.timeout", {
+                    const diagnosticInfo = this.computeDiagnosticInfo(
                         agentActivated,
                         agentReady,
-                        agentHasDefault,
-                        agentDefaultIsCore,
-                        agentHasContributedDefault,
-                        agentContributedDefaultIsCore,
-                        agentActivatedCount,
-                        agentLocation: this.location,
-                        agentModeKind: modeInfo?.kind ?? "",
                         languageModelReady,
-                        languageModelCount: languageModelIds.length,
-                        languageModelDefaultCount,
-                        languageModelHasRequestedModel: !!requestModel.modelId,
                         toolsModelReady,
-                        isRemote: !!this.environmentService.remoteAuthority,
-                        isAnonymous: this.chatEntitlementService.anonymous,
-                        matchingWelcomeViewWhen: matchingWelcomeView?.when.serialize() ?? (chatViewPane ? "noWelcomeView" : "noChatViewPane")
-                    });
+                        requestModel,
+                        languageModelsService,
+                        chatAgentService,
+                        modeInfo
+                    );
+                    this.logService.warn(`[chat setup] ${warningMessage}`, diagnosticInfo);
+                    this.telemetryService.publicLog2("chatSetup.timeout", diagnosticInfo);
                     progress({
                         kind: "warning",
                         content: ( new MarkdownString(warningMessage))
@@ -589,7 +550,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
-                                title: ( localize(6284, "Show Details"))
+                                title: ( localize(6344, "Show Details"))
                             }
                         });
                     } else {
@@ -600,13 +561,24 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                                title: ( localize(6285, "Restart")),
+                                title: ( localize(6345, "Restart")),
                                 arguments: [requestModel.session.sessionResource]
                             }
                         });
                     }
-                    this._onUnresolvableError.fire();
-                    return;
+                    await allReady;
+                    const recoveryDiagnosticInfo = this.computeDiagnosticInfo(
+                        agentActivated,
+                        agentReady,
+                        languageModelReady,
+                        toolsModelReady,
+                        requestModel,
+                        languageModelsService,
+                        chatAgentService,
+                        modeInfo
+                    );
+                    this.logService.info("[chat setup] Chat setup timeout recovered", recoveryDiagnosticInfo);
+                    this.telemetryService.publicLog2("chatSetup.timeoutRecovery", recoveryDiagnosticInfo);
                 }
             } finally {
                 disposables.dispose();
@@ -703,6 +675,48 @@ let SetupAgent = class SetupAgent extends Disposable {
             this.logService.error(error);
         }
     }
+    computeDiagnosticInfo(
+        agentActivated,
+        agentReady,
+        languageModelReady,
+        toolsModelReady,
+        requestModel,
+        languageModelsService,
+        chatAgentService,
+        modeInfo
+    ) {
+        const languageModelIds = languageModelsService.getLanguageModelIds();
+        let languageModelDefaultCount = 0;
+        for (const id of languageModelIds) {
+            const model = languageModelsService.lookupLanguageModel(id);
+            if (model?.isDefaultForLocation[ChatAgentLocation.Chat]) {
+                languageModelDefaultCount++;
+            }
+        }
+        const defaultAgent = chatAgentService.getDefaultAgent(this.location, modeInfo?.kind);
+        const contributedDefaultAgent = chatAgentService.getContributedDefaultAgent(this.location);
+        const chatViewPane = this.viewsService.getActiveViewWithId(ChatViewId);
+        const matchingWelcomeView = chatViewPane?.getMatchingWelcomeView();
+        return {
+            agentActivated,
+            agentReady,
+            agentHasDefault: !!defaultAgent,
+            agentDefaultIsCore: defaultAgent?.isCore ?? false,
+            agentHasContributedDefault: !!contributedDefaultAgent,
+            agentContributedDefaultIsCore: contributedDefaultAgent?.isCore ?? false,
+            agentActivatedCount: chatAgentService.getActivatedAgents().length,
+            agentLocation: this.location,
+            agentModeKind: modeInfo?.kind ?? "",
+            languageModelReady,
+            languageModelCount: languageModelIds.length,
+            languageModelDefaultCount,
+            languageModelHasRequestedModel: !!requestModel.modelId,
+            toolsModelReady,
+            isRemote: !!this.environmentService.remoteAuthority,
+            isAnonymous: this.chatEntitlementService.anonymous,
+            matchingWelcomeViewWhen: matchingWelcomeView?.when.serialize() ?? (chatViewPane ? "noWelcomeView" : "noChatViewPane")
+        };
+    }
     async doInvokeWithSetup(
         request,
         progress,
@@ -725,7 +739,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        6286,
+                        6346,
                         "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
                     )))),
@@ -735,7 +749,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6287, "Getting chat ready")))),
+                    content: ( new MarkdownString(( localize(6347, "Getting chat ready")))),
                     shimmer: true
                 });
                 break;
@@ -772,7 +786,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(6288, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(6348, "Chat setup failed."))))
                 });
             }
         }
@@ -926,13 +940,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(6289, "Generate"));
+                generateOrModifyTitle = ( localize(6349, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(6290, "Modify"));
+                generateOrModifyTitle = ( localize(6350, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -950,14 +964,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6291, "Fix")),
+                title: ( localize(6351, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6292, "Explain")),
+                title: ( localize(6352, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -980,7 +994,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6290, "Modify")),
+            title: ( localize(6350, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -991,7 +1005,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6289, "Generate")),
+            title: ( localize(6349, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1010,7 +1024,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(6292, "Explain")),
+            title: ( localize(6352, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -1020,7 +1034,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(6291, "Fix")),
+            title: ( localize(6351, "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

@@ -4,7 +4,7 @@ import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ChatEntitlementContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
 import { ChatSetupController } from "./chatSetupController.js";
-import { IChatSetupResult, ChatSetupAnonymous } from "./chatSetup.js";
+import { IChatSetupResult, ChatSetupAnonymous, ChatSetupStrategy } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup";
 export declare class ChatSetup {
     private readonly context;
     private readonly controller;
@@ -31,6 +31,7 @@ export declare class ChatSetup {
         forceAnonymous?: ChatSetupAnonymous;
         dialogIcon?: ThemeIcon;
         dialogTitle?: string;
+        setupStrategy?: ChatSetupStrategy;
     }): Promise<IChatSetupResult>;
     private doRun;
     private showDialog;