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

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

@@ -69,6 +69,10 @@ const defaultChat = {
         google: {
             id: "",
             name: ""
+        },
+        microsoft: {
+            id: "",
+            name: ""
         }
     },
     outputChannelId: product.defaultChatAgent?.chatExtensionOutputId ?? "",
@@ -138,7 +142,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(7260, "Ask questions about VS Code")).value,
+                ( localize2(8489, "Ask questions about VS Code")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -153,7 +157,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.workspace",
                 "workspace",
                 false,
-                ( localize2(7261, "Ask about your workspace")).value,
+                ( localize2(8490, "Ask about your workspace")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -168,7 +172,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.terminal.agent",
                 "terminal",
                 false,
-                ( localize2(7262, "Ask how to do something in the terminal")).value,
+                ( localize2(8491, "Ask how to do something in the terminal")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -179,9 +183,9 @@ let SetupAgent = class SetupAgent extends Disposable {
                 id: "setup_tools_createNewWorkspace",
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(7263, "New Workspace")),
+                displayName: ( localize(8492, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(7264, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(8493, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: "new",
                 when: ContextKeyExpr.true()
@@ -236,10 +240,10 @@ let SetupAgent = class SetupAgent extends Disposable {
         };
     }
     static {
-        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(7265, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(8494, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(7266, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(8495, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
@@ -386,7 +390,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(7267, "Getting chat ready")))),
+            content: ( new MarkdownString(( localize(8496, "Getting chat ready")))),
             shimmer: true
         });
         await this.forwardRequestToChat(
@@ -423,7 +427,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(7268, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(8497, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -492,7 +496,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(7269, "Chat is almost ready")))),
+                    content: ( new MarkdownString(( localize(8498, "Chat is almost ready")))),
                     shimmer: true
                 });
             }, 10000);
@@ -509,7 +513,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(7270, "Please try again."));
+                    const warningMessage = ( localize(8499, "Please try again."));
                     progress({
                         kind: "markdownContent",
                         content: ( new MarkdownString(warningMessage))
@@ -521,13 +525,13 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            7271,
+                            8500,
                             "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(
-                            7272,
+                            8501,
                             "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
@@ -554,7 +558,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
-                                title: ( localize(7273, "Show Details"))
+                                title: ( localize(8502, "Show Details"))
                             }
                         });
                     } else {
@@ -565,7 +569,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                                title: ( localize(7274, "Restart")),
+                                title: ( localize(8503, "Restart")),
                                 arguments: [requestModel.session.sessionResource]
                             }
                         });
@@ -592,7 +596,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         await chatService.resendRequest(requestModel, {
             ...widget?.getModeRequestOptions(),
             modeInfo,
-            userSelectedModelId: widget?.input?.currentLanguageModel
+            ...widget?.getSelectedModelRequestOptions()
         });
     }
     async whenPanelAgentHasGuidance(disposables) {
@@ -743,7 +747,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        7275,
+                        8504,
                         "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
                     )))),
@@ -753,7 +757,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(7276, "Getting chat ready")))),
+                    content: ( new MarkdownString(( localize(8505, "Getting chat ready")))),
                     shimmer: true
                 });
                 break;
@@ -790,7 +794,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(7277, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(8506, "Chat setup failed."))))
                 });
             }
         }
@@ -944,13 +948,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(7278, "Generate"));
+                generateOrModifyTitle = ( localize(8507, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(7279, "Modify"));
+                generateOrModifyTitle = ( localize(8508, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -968,14 +972,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(7280, "Fix")),
+                title: ( localize(8509, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(7281, "Explain")),
+                title: ( localize(8510, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -998,7 +1002,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(7279, "Modify")),
+            title: ( localize(8508, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1009,7 +1013,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(7278, "Generate")),
+            title: ( localize(8507, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1028,7 +1032,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(7281, "Explain")),
+            title: ( localize(8510, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -1038,7 +1042,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(7280, "Fix")),
+            title: ( localize(8509, "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,53 +1,100 @@
-import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Lazy } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lazy";
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 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";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { TelemetryLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IWorkspaceTrustRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { ChatEntitlementContext, ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
+import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { ChatSetupController } from "./chatSetupController.js";
-import { IChatSetupResult, ChatSetupAnonymous, ChatSetupStrategy } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup";
+import { IChatSetupResult, ChatSetupAnonymous, ChatSetupStrategy, IChatSetupRunOptions } 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 { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
+export interface IChatSetupDialogButton {
+    readonly label: string;
+    readonly strategy: ChatSetupStrategy;
+    readonly classes?: readonly string[];
+}
+export interface IChatSetupDialogProviders {
+    readonly default: {
+        readonly name: string;
+    };
+    readonly enterprise: {
+        readonly name: string;
+    };
+    readonly apple: {
+        readonly name: string;
+    };
+    readonly google: {
+        readonly name: string;
+    };
+    readonly microsoft: {
+        readonly name: string;
+    };
+}
+export interface IChatSetupDialogFooterContent {
+    readonly providerName: string;
+    readonly termsStatementUrl: string;
+    readonly privacyStatementUrl: string;
+    readonly publicCodeMatchesUrl: string;
+}
+export interface IChatSetupDialogOptions {
+    readonly title: string;
+    readonly buttons: readonly IChatSetupDialogButton[];
+    readonly icon: ThemeIcon;
+    readonly disableCloseButton: boolean;
+    readonly footer: string;
+    readonly extraClasses?: readonly string[];
+    readonly renderFooter?: (container: HTMLElement) => IDisposable | undefined;
+}
+export declare class ChatSetupDialog extends Disposable {
+    private readonly options;
+    private readonly dialog;
+    constructor(container: HTMLElement, options: IChatSetupDialogOptions, keybindingService: IKeybindingService, layoutService: IWorkbenchLayoutService, hostService: IHostService, markdownRendererService: IMarkdownRendererService, contextKeyService: IContextKeyService);
+    show(): Promise<ChatSetupStrategy>;
+}
+export declare function showChatSetupDialogWithCancellation(dialog: Pick<ChatSetupDialog, "show" | "dispose">, cancellationToken: CancellationToken | undefined, onDidDismissDialog?: () => void): Promise<ChatSetupStrategy>;
+/**
+ * Whether the sign-in dialog should offer "Continue with Microsoft". The dialog treats it as one
+ * more provider button, exactly like Google and Apple: it goes to whichever host the default
+ * account provider points at, and a host that cannot broker a Microsoft identity refuses it in the
+ * authentication extension rather than here.
+ */
+export declare function shouldShowMicrosoftProvider(configurationService: IConfigurationService): boolean;
+export declare function getChatSetupDialogButtons(entitlement: ChatEntitlement, options: IChatSetupRunOptions | undefined, enterpriseAuthentication: boolean, showMicrosoftProvider: boolean, providers?: IChatSetupDialogProviders): IChatSetupDialogButton[];
+export declare function getChatSetupDialogFooter(forceAnonymous: ChatSetupAnonymous | undefined, telemetryLevel: TelemetryLevel, settingsUrl: string, content?: IChatSetupDialogFooterContent): string;
 export declare class ChatSetup {
     private readonly context;
     private readonly controller;
     private readonly telemetryService;
     private readonly layoutService;
-    private readonly keybindingService;
     private readonly chatEntitlementService;
     private readonly logService;
     private readonly widgetService;
     private readonly workspaceTrustRequestService;
-    private readonly markdownRendererService;
     private readonly defaultAccountService;
-    private readonly hostService;
     private readonly extensionService;
     private readonly workspaceTrustManagementService;
+    private readonly instantiationService;
+    private readonly configurationService;
     private static instance;
     static getInstance(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): ChatSetup;
     private pendingRun;
     private skipDialogOnce;
-    constructor(context: ChatEntitlementContext, controller: Lazy<ChatSetupController>, telemetryService: ITelemetryService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, chatEntitlementService: ChatEntitlementService, logService: ILogService, widgetService: IChatWidgetService, workspaceTrustRequestService: IWorkspaceTrustRequestService, markdownRendererService: IMarkdownRendererService, defaultAccountService: IDefaultAccountService, hostService: IHostService, extensionService: IExtensionService, workspaceTrustManagementService: IWorkspaceTrustManagementService);
+    constructor(context: ChatEntitlementContext, controller: Lazy<ChatSetupController>, telemetryService: ITelemetryService, layoutService: IWorkbenchLayoutService, chatEntitlementService: ChatEntitlementService, logService: ILogService, widgetService: IChatWidgetService, workspaceTrustRequestService: IWorkspaceTrustRequestService, defaultAccountService: IDefaultAccountService, extensionService: IExtensionService, workspaceTrustManagementService: IWorkspaceTrustManagementService, instantiationService: IInstantiationService, configurationService: IConfigurationService);
     skipDialog(): void;
-    run(options?: {
-        disableChatViewReveal?: boolean;
-        forceSignInDialog?: boolean;
-        additionalScopes?: readonly string[];
-        forceAnonymous?: ChatSetupAnonymous;
-        dialogIcon?: ThemeIcon;
-        dialogTitle?: string;
-        setupStrategy?: ChatSetupStrategy;
-        disableCloseButton?: boolean;
-        onSignInStarted?: () => void;
-    }): Promise<IChatSetupResult>;
+    run(options?: IChatSetupRunOptions): Promise<IChatSetupResult>;
     private doRun;
     /**
      * Whether the default chat extension has finished activating. `activationTimes`
@@ -61,8 +108,6 @@ export declare class ChatSetup {
      */
     private whenChatExtensionActivated;
     private showDialog;
-    private getButtons;
     private getDialogTitle;
-    private createDialogFooter;
 }
 export declare function refreshTokens(commandService: ICommandService): void;