@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

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

@@ -1,13 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { raceTimeout, timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 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';
@@ -37,11 +38,15 @@ import { CodeActionKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/co
 import { ACTION_START } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 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 { ChatSetupStep, ChatSetupAnonymous } from './chatSetup.js';
+import { maybeEnableAuthExtension, refreshTokens, ChatSetupStep, ChatSetupAnonymous } from './chatSetup.js';
 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';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IDefaultAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { IOutputService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 
 var SetupAgent_1, AINewSymbolNamesProvider_1, ChatCodeActionsProvider_1;
 const defaultChat = {
@@ -65,7 +70,8 @@ const defaultChat = {
             name: ""
         }
     },
-    outputChannelId: product.defaultChatAgent?.chatExtensionOutputId ?? ""
+    outputChannelId: product.defaultChatAgent?.chatExtensionOutputId ?? "",
+    outputExtensionStateCommand: product.defaultChatAgent?.chatExtensionOutputExtensionStateCommand ?? ""
 };
 const ToolsAgentContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentEnabled}`, true)),
 ContextKeyExpr.not(`previewFeaturesDisabled`)));
@@ -131,7 +137,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(5580, "Ask questions about VS Code")).value,
+                ( localize2(6090, "Ask questions about VS Code")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -146,7 +152,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.workspace",
                 "workspace",
                 false,
-                ( localize2(5581, "Ask about your workspace")).value,
+                ( localize2(6091, "Ask about your workspace")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -161,7 +167,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.terminal.agent",
                 "terminal",
                 false,
-                ( localize2(5582, "Ask how to do something in the terminal")).value,
+                ( localize2(6092, "Ask how to do something in the terminal")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -172,9 +178,9 @@ let SetupAgent = class SetupAgent extends Disposable {
                 id: "setup_tools_createNewWorkspace",
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(5583, "New Workspace")),
+                displayName: ( localize(6093, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(5584, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(6094, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: "new",
                 when: ContextKeyExpr.true()
@@ -229,14 +235,17 @@ let SetupAgent = class SetupAgent extends Disposable {
         };
     }
     static {
-        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(5585, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6095, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(5586, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6096, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
     }
+    static {
+        this.CHAT_SHOW_OUTPUT_COMMAND_ID = "workbench.action.chat.showOutput";
+    }
     constructor(
         context,
         controller,
@@ -247,7 +256,11 @@ let SetupAgent = class SetupAgent extends Disposable {
         environmentService,
         workspaceTrustManagementService,
         chatEntitlementService,
-        viewsService
+        viewsService,
+        contextKeyService,
+        outputService,
+        extensionsWorkbenchService,
+        commandService
     ) {
         super();
         this.context = context;
@@ -260,6 +273,10 @@ let SetupAgent = class SetupAgent extends Disposable {
         this.workspaceTrustManagementService = workspaceTrustManagementService;
         this.chatEntitlementService = chatEntitlementService;
         this.viewsService = viewsService;
+        this.contextKeyService = contextKeyService;
+        this.outputService = outputService;
+        this.extensionsWorkbenchService = extensionsWorkbenchService;
+        this.commandService = commandService;
         this._onUnresolvableError = this._register(( new Emitter()));
         this.onUnresolvableError = this._onUnresolvableError.event;
         this.pendingForwardedRequests = ( new ResourceMap());
@@ -275,6 +292,23 @@ let SetupAgent = class SetupAgent extends Disposable {
                 hostService.reload();
             })
         );
+        this._register(
+            CommandsRegistry.registerCommand(SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID, async accessor => {
+                const commandService = accessor.get(ICommandService);
+                if (defaultChat.outputExtensionStateCommand) {
+                    raceTimeout(
+                        commandService.executeCommand(defaultChat.outputExtensionStateCommand),
+                        5000,
+                        () => this.logService.info("[chat setup] Timed out executing extension state command")
+                    ).then(undefined, error => {
+                        this.logService.info("[chat setup] Failed to execute extension state command", error);
+                    });
+                }
+                if (defaultChat.outputChannelId) {
+                    await commandService.executeCommand(`workbench.action.output.show.${defaultChat.outputChannelId}`);
+                }
+            })
+        );
     }
     async invoke(request, progress) {
         return this.instantiationService.invokeFunction(async accessor  => {
@@ -347,7 +381,8 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(5587, "Getting chat ready..."))))
+            content: ( new MarkdownString(( localize(6097, "Getting chat ready")))),
+            shimmer: true
         });
         await this.forwardRequestToChat(
             requestModel,
@@ -383,7 +418,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(5588, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(6098, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -424,6 +459,10 @@ let SetupAgent = class SetupAgent extends Disposable {
         chatWidgetService,
         languageModelToolsService
     ) {
+        const authExtensionReEnabled = await maybeEnableAuthExtension(this.extensionsWorkbenchService, this.logService);
+        if (authExtensionReEnabled) {
+            refreshTokens(this.commandService);
+        }
         const widget = chatWidgetService.getWidgetBySessionResource(requestModel.session.sessionResource);
         const modeInfo = widget?.input.currentModeInfo;
         let agentActivated = false;
@@ -447,38 +486,75 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(5589, "Chat is almost ready..."))))
+                    content: ( new MarkdownString(( localize(6099, "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"), Promise.allSettled([
+                ).then(() => "timedout"), this.whenPanelAgentHasGuidance(disposables).then(() => "panelGuidance"), Promise.allSettled([
                     whenAgentActivated,
                     whenAgentReady,
                     whenLanguageModelReady,
                     whenToolsModelReady
                 ])]);
+                if (ready === "panelGuidance") {
+                    const warningMessage = ( localize(6100, "Please try again."));
+                    progress({
+                        kind: "markdownContent",
+                        content: ( new MarkdownString(warningMessage))
+                    });
+                    this._onUnresolvableError.fire();
+                    return;
+                }
                 if (ready === "timedout") {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            5590,
+                            6101,
                             "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(
-                            5591,
+                            6102,
                             "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);
@@ -486,7 +562,17 @@ let SetupAgent = class SetupAgent extends Disposable {
                     this.telemetryService.publicLog2("chatSetup.timeout", {
                         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,
@@ -496,19 +582,29 @@ let SetupAgent = class SetupAgent extends Disposable {
                         kind: "warning",
                         content: ( new MarkdownString(warningMessage))
                     });
-                    progress({
-                        kind: "command",
-                        command: {
-                            id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                            title: ( localize(5592, "Restart")),
-                            arguments: [requestModel.session.sessionResource]
-                        }
-                    });
+                    if (defaultChat.outputChannelId && this.outputService.getChannelDescriptor(defaultChat.outputChannelId)) {
+                        progress({
+                            kind: "command",
+                            command: {
+                                id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
+                                title: ( localize(6103, "Show Details"))
+                            }
+                        });
+                    } else {
+                        progress({
+                            kind: "command",
+                            command: {
+                                id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
+                                title: ( localize(6104, "Restart")),
+                                arguments: [requestModel.session.sessionResource]
+                            }
+                        });
+                    }
                     this._onUnresolvableError.fire();
                     return;
                 }
             } finally {
-                clearTimeout(timeoutHandle);
+                disposables.dispose();
             }
         }
         await chatService.resendRequest(requestModel, {
@@ -517,6 +613,33 @@ let SetupAgent = class SetupAgent extends Disposable {
             userSelectedModelId: widget?.input.currentLanguageModel
         });
     }
+    async whenPanelAgentHasGuidance(disposables) {
+        const panelAgentHasGuidance = () => ( chatViewsWelcomeRegistry.get().some(descriptor => this.contextKeyService.contextMatchesRules(descriptor.when)));
+        if (panelAgentHasGuidance()) {
+            return;
+        }
+        return ( new Promise(resolve => {
+            let descriptorKeys = ( new Set());
+            const updateDescriptorKeys = () => {
+                const descriptors = chatViewsWelcomeRegistry.get();
+                descriptorKeys = ( new Set(descriptors.flatMap(d => ( d.when.keys()))));
+            };
+            updateDescriptorKeys();
+            const onDidChangeRegistry = ( Event.map(chatViewsWelcomeRegistry.onDidChange, () => "registry"));
+            const onDidChangeRelevantContext = ( Event.map(Event.filter(
+                this.contextKeyService.onDidChangeContext,
+                e => e.affectsSome(descriptorKeys)
+            ), () => "context"));
+            disposables.add(Event.any(onDidChangeRegistry, onDidChangeRelevantContext)(source => {
+                if (source === "registry") {
+                    updateDescriptorKeys();
+                }
+                if (panelAgentHasGuidance()) {
+                    resolve();
+                }
+            }));
+        }));
+    }
     whenLanguageModelReady(languageModelsService, modelId) {
         const hasModelForRequest = () => {
             if (modelId) {
@@ -596,16 +719,18 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        5593,
-                        "Signing in to {0}...",
+                        6105,
+                        "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
-                    ))))
+                    )))),
+                    shimmer: true
                 });
                 break;
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(5594, "Getting chat ready..."))))
+                    content: ( new MarkdownString(( localize(6106, "Getting chat ready")))),
+                    shimmer: true
                 });
                 break;
             }
@@ -641,7 +766,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(5595, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(6107, "Chat setup failed."))))
                 });
             }
         }
@@ -731,7 +856,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }));
     }
 };
-SetupAgent = SetupAgent_1 = ( __decorate([( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, ITelemetryService)), ( __param(6, IWorkbenchEnvironmentService)), ( __param(7, IWorkspaceTrustManagementService)), ( __param(8, IChatEntitlementService)), ( __param(9, IViewsService))], SetupAgent));
+SetupAgent = SetupAgent_1 = ( __decorate([( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, ITelemetryService)), ( __param(6, IWorkbenchEnvironmentService)), ( __param(7, IWorkspaceTrustManagementService)), ( __param(8, IChatEntitlementService)), ( __param(9, IViewsService)), ( __param(10, IContextKeyService)), ( __param(11, IOutputService)), ( __param(12, IExtensionsWorkbenchService)), ( __param(13, ICommandService))], SetupAgent));
 class SetupTool {
     static registerTool(instantiationService, toolData) {
         return instantiationService.invokeFunction(accessor => {
@@ -795,13 +920,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(5596, "Generate"));
+                generateOrModifyTitle = ( localize(6108, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(5597, "Modify"));
+                generateOrModifyTitle = ( localize(6109, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -819,14 +944,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(5598, "Fix")),
+                title: ( localize(6110, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(5599, "Explain")),
+                title: ( localize(6111, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -849,7 +974,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(5597, "Modify")),
+            title: ( localize(6109, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -860,7 +985,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(5596, "Generate")),
+            title: ( localize(6108, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -879,7 +1004,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(5599, "Explain")),
+            title: ( localize(6111, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -889,7 +1014,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(5598, "Fix")),
+            title: ( localize(6110, "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

@@ -1,3 +1,4 @@
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { Lazy } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lazy";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -16,6 +17,8 @@ export declare class ChatSetup {
     private readonly workspaceTrustRequestService;
     private readonly markdownRendererService;
     private readonly defaultAccountService;
+    private readonly hostService;
+    private readonly experimentService;
     private static instance;
     static getInstance(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): ChatSetup;
     private pendingRun;
@@ -27,6 +30,9 @@ export declare class ChatSetup {
         forceSignInDialog?: boolean;
         additionalScopes?: readonly string[];
         forceAnonymous?: ChatSetupAnonymous;
+        dialogIcon?: ThemeIcon;
+        dialogTitle?: string;
+        dialogHideSkip?: boolean;
     }): Promise<IChatSetupResult>;
     private doRun;
     private showDialog;

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

@@ -11,7 +11,7 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/browser/dialog';
+import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/dialogs/dialog';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -25,6 +25,8 @@ import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatSetupStrategy, ChatSetupAnonymous } from './chatSetup.js';
 import { IDefaultAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 
 var ChatSetup_1;
 registerCss(chatSetup);
@@ -70,7 +72,9 @@ let ChatSetup = class ChatSetup {
                     accessor.get(IChatWidgetService),
                     accessor.get(IWorkspaceTrustRequestService),
                     accessor.get(IMarkdownRendererService),
-                    accessor.get(IDefaultAccountService)
+                    accessor.get(IDefaultAccountService),
+                    accessor.get(IHostService),
+                    accessor.get(IWorkbenchAssignmentService)
                 ));
             });
         }
@@ -87,7 +91,9 @@ let ChatSetup = class ChatSetup {
         widgetService,
         workspaceTrustRequestService,
         markdownRendererService,
-        defaultAccountService
+        defaultAccountService,
+        hostService,
+        experimentService
     ) {
         this.context = context;
         this.controller = controller;
@@ -100,6 +106,8 @@ let ChatSetup = class ChatSetup {
         this.workspaceTrustRequestService = workspaceTrustRequestService;
         this.markdownRendererService = markdownRendererService;
         this.defaultAccountService = defaultAccountService;
+        this.hostService = hostService;
+        this.experimentService = experimentService;
         this.pendingRun = undefined;
         this.skipDialogOnce = false;
     }
@@ -124,7 +132,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(5600, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(6112, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({
@@ -219,7 +227,8 @@ let ChatSetup = class ChatSetup {
     }
     async showDialog(options) {
         const disposables = ( new DisposableStore());
-        const buttons = this.getButtons(options);
+        const useCloseButton = options?.dialogHideSkip || (await this.experimentService.getTreatment("chatSetupDialogCloseButton"));
+        const buttons = this.getButtons(options, useCloseButton);
         const dialog = disposables.add(( new Dialog(
             this.layoutService.activeContainer,
             this.getDialogTitle(options),
@@ -228,13 +237,13 @@ let ChatSetup = class ChatSetup {
                 type: "none",
                 extraClasses: ["chat-setup-dialog"],
                 detail: " ",
-                icon: Codicon.copilotLarge,
+                icon: options?.dialogIcon ?? Codicon.copilotLarge,
                 alignment: DialogContentsAlignment.Vertical,
-                cancelId: buttons.length - 1,
-                disableCloseButton: true,
+                cancelId: useCloseButton ? buttons.length : buttons.length - 1,
+                disableCloseButton: !useCloseButton,
                 renderFooter: footer => footer.appendChild(this.createDialogFooter(disposables, options)),
                 buttonOptions: ( buttons.map(button => button[2]))
-            }, this.keybindingService, this.layoutService)
+            }, this.keybindingService, this.layoutService, this.hostService)
         )));
         const {
             button
@@ -242,26 +251,26 @@ let ChatSetup = class ChatSetup {
         disposables.dispose();
         return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
     }
-    getButtons(options) {
+    getButtons(options, useCloseButton) {
         const styleButton = (...classes) => ({
             styleButton: button => button.element.classList.add(...classes)
         });
         let buttons;
         if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
-            const defaultProviderButton = [( localize(5601, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
+            const defaultProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
             const defaultProviderLink = [
                 defaultProviderButton[0],
                 defaultProviderButton[1],
                 styleButton("link-button")
             ];
-            const enterpriseProviderButton = [( localize(5601, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
+            const enterpriseProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
             const enterpriseProviderLink = [
                 enterpriseProviderButton[0],
                 enterpriseProviderButton[1],
                 styleButton("link-button")
             ];
-            const googleProviderButton = [( localize(5601, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
-            const appleProviderButton = [( localize(5601, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
+            const googleProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
             if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
@@ -278,30 +287,35 @@ let ChatSetup = class ChatSetup {
                 ]);
             }
         } else {
-            buttons = [[( localize(5602, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(6114, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
+        }
+        if (!useCloseButton) {
+            buttons.push([( localize(6115, "Skip for now")), ChatSetupStrategy.Canceled, styleButton("link-button", "skip-button")]);
         }
-        buttons.push([( localize(5603, "Skip for now")), ChatSetupStrategy.Canceled, styleButton("link-button", "skip-button")]);
         return buttons;
     }
     getDialogTitle(options) {
+        if (options?.dialogTitle) {
+            return options.dialogTitle;
+        }
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(5604, "Start using AI Features");
+                return localize(6116, "Start using AI Features");
             } else {
-                return localize(5605, "Enable more AI features");
+                return localize(6117, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(5606, "Sign in to use AI Features");
+            return localize(6118, "Sign in to use AI Features");
         }
-        return localize(5604, "Start using AI Features");
+        return localize(6116, "Start using AI Features");
     }
     createDialogFooter(disposables, options) {
         const element = $(".chat-setup-dialog-footer");
         let footer;
         if (options?.forceAnonymous || this.telemetryService.telemetryLevel === TelemetryLevel.NONE) {
             footer = ( localize(
-                5607,
+                6119,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -309,7 +323,7 @@ let ChatSetup = class ChatSetup {
             ));
         } else {
             footer = ( localize(
-                5608,
+                6120,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}). {3} Copilot may show [public code]({4}) suggestions and use your data to improve the product. You can change these [settings]({5}) anytime.",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -329,6 +343,6 @@ let ChatSetup = class ChatSetup {
         return element;
     }
 };
-ChatSetup = ChatSetup_1 = ( __decorate([( __param(2, ITelemetryService)), ( __param(3, ILayoutService)), ( __param(4, IKeybindingService)), ( __param(5, IChatEntitlementService)), ( __param(6, ILogService)), ( __param(7, IChatWidgetService)), ( __param(8, IWorkspaceTrustRequestService)), ( __param(9, IMarkdownRendererService)), ( __param(10, IDefaultAccountService))], ChatSetup));
+ChatSetup = ChatSetup_1 = ( __decorate([( __param(2, ITelemetryService)), ( __param(3, ILayoutService)), ( __param(4, IKeybindingService)), ( __param(5, IChatEntitlementService)), ( __param(6, ILogService)), ( __param(7, IChatWidgetService)), ( __param(8, IWorkspaceTrustRequestService)), ( __param(9, IMarkdownRendererService)), ( __param(10, IDefaultAccountService)), ( __param(11, IHostService)), ( __param(12, IWorkbenchAssignmentService))], ChatSetup));
 
 export { ChatSetup };