@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -12,10 +12,10 @@ export declare class ChatSetup {
     private readonly keybindingService;
     private readonly chatEntitlementService;
     private readonly logService;
-    private readonly configurationService;
     private readonly widgetService;
     private readonly workspaceTrustRequestService;
     private readonly markdownRendererService;
+    private readonly defaultAccountService;
     private static instance;
     static getInstance(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): ChatSetup;
     private pendingRun;

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

@@ -11,7 +11,6 @@ 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 { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/browser/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';
@@ -21,23 +20,41 @@ import { TelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 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 { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { isProUser, ChatEntitlement, ChatEntitlementRequests } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { isProUser, ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 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';
 
 var ChatSetup_1;
 registerCss(chatSetup);
 const defaultChat = {
-    publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
-    provider: product.defaultChatAgent?.provider ?? { default: { name: '' }, enterprise: { id: '', name: '' }, apple: { name: '' }, google: { name: '' } },
-    manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
-    termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
-    privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ''
+    publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? "",
+    provider: product.defaultChatAgent?.provider ?? {
+        default: {
+            name: ""
+        },
+        enterprise: {
+            name: ""
+        },
+        apple: {
+            name: ""
+        },
+        google: {
+            name: ""
+        }
+    },
+    manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? "",
+    termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? "",
+    privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ""
 };
 let ChatSetup = class ChatSetup {
-    static { ChatSetup_1 = this; }
-    static { this.instance = undefined; }
+    static {
+        ChatSetup_1 = this;
+    }
+    static {
+        this.instance = undefined;
+    }
     static getInstance(instantiationService, context, controller) {
         let instance = ChatSetup_1.instance;
         if (!instance) {
@@ -50,16 +67,28 @@ let ChatSetup = class ChatSetup {
                     accessor.get(IKeybindingService),
                     accessor.get(IChatEntitlementService),
                     accessor.get(ILogService),
-                    accessor.get(IConfigurationService),
                     accessor.get(IChatWidgetService),
                     accessor.get(IWorkspaceTrustRequestService),
-                    accessor.get(IMarkdownRendererService)
+                    accessor.get(IMarkdownRendererService),
+                    accessor.get(IDefaultAccountService)
                 ));
             });
         }
         return instance;
     }
-    constructor(context, controller, telemetryService, layoutService, keybindingService, chatEntitlementService, logService, configurationService, widgetService, workspaceTrustRequestService, markdownRendererService) {
+    constructor(
+        context,
+        controller,
+        telemetryService,
+        layoutService,
+        keybindingService,
+        chatEntitlementService,
+        logService,
+        widgetService,
+        workspaceTrustRequestService,
+        markdownRendererService,
+        defaultAccountService
+    ) {
         this.context = context;
         this.controller = controller;
         this.telemetryService = telemetryService;
@@ -67,10 +96,10 @@ let ChatSetup = class ChatSetup {
         this.keybindingService = keybindingService;
         this.chatEntitlementService = chatEntitlementService;
         this.logService = logService;
-        this.configurationService = configurationService;
         this.widgetService = widgetService;
         this.workspaceTrustRequestService = workspaceTrustRequestService;
         this.markdownRendererService = markdownRendererService;
+        this.defaultAccountService = defaultAccountService;
         this.pendingRun = undefined;
         this.skipDialogOnce = false;
     }
@@ -84,34 +113,43 @@ let ChatSetup = class ChatSetup {
         this.pendingRun = this.doRun(options);
         try {
             return await this.pendingRun;
-        }
-        finally {
+        } finally {
             this.pendingRun = undefined;
         }
     }
     async doRun(options) {
-        this.context.update({ later: false });
+        this.context.update({
+            later: false
+        });
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(5373, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(5566, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
-            this.context.update({ later: true });
-            this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
-            return { dialogSkipped, success: undefined  };
+            this.context.update({
+                later: true
+            });
+            this.telemetryService.publicLog2("commandCenter.chatInstall", {
+                installResult: "failedNotTrusted",
+                installDuration: 0,
+                signUpErrorCode: undefined,
+                provider: undefined
+            });
+            return {
+                dialogSkipped,
+                success: undefined
+            };
         }
         let setupStrategy;
         if (!options?.forceSignInDialog && (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free)) {
             setupStrategy = ChatSetupStrategy.DefaultSetup;
-        }
-        else if (options?.forceAnonymous === ChatSetupAnonymous.EnabledWithoutDialog) {
+        } else if (options?.forceAnonymous === ChatSetupAnonymous.EnabledWithoutDialog) {
             setupStrategy = ChatSetupStrategy.DefaultSetup;
-        }
-        else {
+        } else {
             setupStrategy = await this.showDialog(options);
         }
-        if (setupStrategy === ChatSetupStrategy.DefaultSetup && ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id) {
+        if (setupStrategy === ChatSetupStrategy.DefaultSetup && this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
             setupStrategy = ChatSetupStrategy.SetupWithEnterpriseProvider;
         }
         if (setupStrategy !== ChatSetupStrategy.Canceled && !options?.disableChatViewReveal) {
@@ -120,32 +158,64 @@ let ChatSetup = class ChatSetup {
         let success = undefined;
         try {
             switch (setupStrategy) {
-                case ChatSetupStrategy.SetupWithEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useSocialProvider: undefined, additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-                    break;
-                case ChatSetupStrategy.SetupWithoutEnterpriseProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: undefined, additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-                    break;
-                case ChatSetupStrategy.SetupWithAppleProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'apple', additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-                    break;
-                case ChatSetupStrategy.SetupWithGoogleProvider:
-                    success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'google', additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-                    break;
-                case ChatSetupStrategy.DefaultSetup:
-                    success = await this.controller.value.setup({ ...options, forceAnonymous: options?.forceAnonymous });
-                    break;
-                case ChatSetupStrategy.Canceled:
-                    this.context.update({ later: true });
-                    this.telemetryService.publicLog2('commandCenter.chatInstall', { installResult: 'failedMaybeLater', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
-                    break;
+            case ChatSetupStrategy.SetupWithEnterpriseProvider:
+                success = await this.controller.value.setupWithProvider({
+                    useEnterpriseProvider: true,
+                    useSocialProvider: undefined,
+                    additionalScopes: options?.additionalScopes,
+                    forceAnonymous: options?.forceAnonymous
+                });
+                break;
+            case ChatSetupStrategy.SetupWithoutEnterpriseProvider:
+                success = await this.controller.value.setupWithProvider({
+                    useEnterpriseProvider: false,
+                    useSocialProvider: undefined,
+                    additionalScopes: options?.additionalScopes,
+                    forceAnonymous: options?.forceAnonymous
+                });
+                break;
+            case ChatSetupStrategy.SetupWithAppleProvider:
+                success = await this.controller.value.setupWithProvider({
+                    useEnterpriseProvider: false,
+                    useSocialProvider: "apple",
+                    additionalScopes: options?.additionalScopes,
+                    forceAnonymous: options?.forceAnonymous
+                });
+                break;
+            case ChatSetupStrategy.SetupWithGoogleProvider:
+                success = await this.controller.value.setupWithProvider({
+                    useEnterpriseProvider: false,
+                    useSocialProvider: "google",
+                    additionalScopes: options?.additionalScopes,
+                    forceAnonymous: options?.forceAnonymous
+                });
+                break;
+            case ChatSetupStrategy.DefaultSetup:
+                success = await this.controller.value.setup({
+                    ...options,
+                    forceAnonymous: options?.forceAnonymous
+                });
+                break;
+            case ChatSetupStrategy.Canceled:
+                this.context.update({
+                    later: true
+                });
+                this.telemetryService.publicLog2("commandCenter.chatInstall", {
+                    installResult: "failedMaybeLater",
+                    installDuration: 0,
+                    signUpErrorCode: undefined,
+                    provider: undefined
+                });
+                break;
             }
-        }
-        catch (error) {
+        } catch (error) {
             this.logService.error(`[chat setup] Error during setup: ${toErrorMessage(error)}`);
             success = false;
         }
-        return { success, dialogSkipped };
+        return {
+            success,
+            dialogSkipped
+        };
     }
     async showDialog(options) {
         const disposables = ( new DisposableStore());
@@ -155,9 +225,9 @@ let ChatSetup = class ChatSetup {
             this.getDialogTitle(options),
             ( buttons.map(button => button[0])),
             createWorkbenchDialogOptions({
-                type: 'none',
-                extraClasses: ['chat-setup-dialog'],
-                detail: ' ',
+                type: "none",
+                extraClasses: ["chat-setup-dialog"],
+                detail: " ",
                 icon: Codicon.copilotLarge,
                 alignment: DialogContentsAlignment.Vertical,
                 cancelId: buttons.length - 1,
@@ -166,29 +236,40 @@ let ChatSetup = class ChatSetup {
                 buttonOptions: ( buttons.map(button => button[2]))
             }, this.keybindingService, this.layoutService)
         )));
-        const { button } = await dialog.show();
+        const {
+            button
+        } = await dialog.show();
         disposables.dispose();
         return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
     }
     getButtons(options) {
-        const styleButton = (...classes) => ({ styleButton: (button) => button.element.classList.add(...classes) });
+        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(5374, "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(5374, "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(5374, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton('continue-button', 'google')];
-            const appleProviderButton = [( localize(5374, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton('continue-button', 'apple')];
-            if (ChatEntitlementRequests.providerId(this.configurationService) !== defaultChat.provider.enterprise.id) {
+            const defaultProviderButton = [( localize(5567, "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(5567, "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(5567, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(5567, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
+            if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
                     googleProviderButton,
                     appleProviderButton,
                     enterpriseProviderLink
                 ]);
-            }
-            else {
+            } else {
                 buttons = coalesce([
                     enterpriseProviderButton,
                     googleProviderButton,
@@ -196,42 +277,39 @@ let ChatSetup = class ChatSetup {
                     defaultProviderLink
                 ]);
             }
+        } else {
+            buttons = [[( localize(5568, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
-        else {
-            buttons = [[( localize(5375, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
-        }
-        buttons.push([( localize(5376, "Skip for now")), ChatSetupStrategy.Canceled, styleButton('link-button', 'skip-button')]);
+        buttons.push([( localize(5569, "Skip for now")), ChatSetupStrategy.Canceled, styleButton("link-button", "skip-button")]);
         return buttons;
     }
     getDialogTitle(options) {
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(5377, "Start using AI Features");
-            }
-            else {
-                return localize(5378, "Enable more AI features");
+                return localize(5570, "Start using AI Features");
+            } else {
+                return localize(5571, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(5379, "Sign in to use AI Features");
+            return localize(5572, "Sign in to use AI Features");
         }
-        return localize(5377, "Start using AI Features");
+        return localize(5570, "Start using AI Features");
     }
     createDialogFooter(disposables, options) {
-        const element = $('.chat-setup-dialog-footer');
+        const element = $(".chat-setup-dialog-footer");
         let footer;
         if (options?.forceAnonymous || this.telemetryService.telemetryLevel === TelemetryLevel.NONE) {
             footer = ( localize(
-                5380,
+                5573,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
                 defaultChat.privacyStatementUrl
             ));
-        }
-        else {
+        } else {
             footer = ( localize(
-                5381,
+                5574,
                 "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,
@@ -241,20 +319,16 @@ let ChatSetup = class ChatSetup {
                 defaultChat.manageSettingsUrl
             ));
         }
-        element.appendChild($('p', undefined, disposables.add(this.markdownRendererService.render(( new MarkdownString(footer, { isTrusted: true })))).element));
+        element.appendChild($(
+            "p",
+            undefined,
+            disposables.add(this.markdownRendererService.render(( new MarkdownString(footer, {
+                isTrusted: true
+            })))).element
+        ));
         return element;
     }
 };
-ChatSetup = ChatSetup_1 = ( __decorate([
-    ( __param(2, ITelemetryService)),
-    ( __param(3, ILayoutService)),
-    ( __param(4, IKeybindingService)),
-    ( __param(5, IChatEntitlementService)),
-    ( __param(6, ILogService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IChatWidgetService)),
-    ( __param(9, IWorkspaceTrustRequestService)),
-    ( __param(10, IMarkdownRendererService))
-], 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))], ChatSetup));
 
 export { ChatSetup };

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/media/chatSetup.css

@@ -51,7 +51,8 @@
 	}
 }
 
-.monaco-workbench.hc-light .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before {
+.monaco-workbench.hc-light .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before,
+.monaco-workbench.vs .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before {
 	background-image: url('./apple-light.svg');
 }
 

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

@@ -1,4 +1,2 @@
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare function isNewUser(chatEntitlementService: IChatEntitlementService): boolean;
-export declare function isCompletionsEnabled(configurationService: IConfigurationService, modeId?: string): boolean;

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatus.js

@@ -1,21 +1,9 @@
 
 import { ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
-import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
-import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 function isNewUser(chatEntitlementService) {
     return !chatEntitlementService.sentiment.installed ||
         chatEntitlementService.entitlement === ChatEntitlement.Available;
 }
-function isCompletionsEnabled(configurationService, modeId = '*') {
-    const result = configurationService.getValue(product.defaultChatAgent.completionsEnablementSetting);
-    if (!isObject(result)) {
-        return false;
-    }
-    if (typeof result[modeId] !== 'undefined') {
-        return Boolean(result[modeId]);
-    }
-    return Boolean(result['*']);
-}
 
-export { isCompletionsEnabled, isNewUser };
+export { isNewUser };

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.d.ts

@@ -40,6 +40,7 @@ export declare class ChatStatusDashboard extends DomWidget {
     constructor(chatEntitlementService: ChatEntitlementService, chatStatusItemService: IChatStatusItemService, commandService: ICommandService, configurationService: IConfigurationService, editorService: IEditorService, hoverService: IHoverService, languageService: ILanguageService, openerService: IOpenerService, telemetryService: ITelemetryService, textResourceConfigurationService: ITextResourceConfigurationService, inlineCompletionsService: IInlineCompletionsService, chatSessionsService: IChatSessionsService, markdownRendererService: IMarkdownRendererService, languageFeaturesService: ILanguageFeaturesService, quickInputService: IQuickInputService, viewService: IViewsService);
     private render;
     private canUseChat;
+    private getUsageTitle;
     private renderHeader;
     private renderContributedChatStatusItem;
     private renderTextPlus;