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

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

@@ -23,7 +23,7 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 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 { ChatSetupStrategy, ChatSetupAnonymous } 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';
 
@@ -128,7 +128,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(6293, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(6353, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({
@@ -146,7 +146,9 @@ let ChatSetup = class ChatSetup {
             };
         }
         let setupStrategy;
-        if (!options?.forceSignInDialog && (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free)) {
+        if (options?.setupStrategy !== undefined) {
+            setupStrategy = options.setupStrategy;
+        } else if (!options?.forceSignInDialog && (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free)) {
             setupStrategy = ChatSetupStrategy.DefaultSetup;
         } else if (options?.forceAnonymous === ChatSetupAnonymous.EnabledWithoutDialog) {
             setupStrategy = ChatSetupStrategy.DefaultSetup;
@@ -216,6 +218,11 @@ let ChatSetup = class ChatSetup {
             this.logService.error(`[chat setup] Error during setup: ${toErrorMessage(error)}`);
             success = false;
         }
+        if (success) {
+            this.context.update({
+                completed: true
+            });
+        }
         return {
             success,
             dialogSkipped
@@ -252,20 +259,20 @@ let ChatSetup = class ChatSetup {
         });
         let buttons;
         if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
-            const defaultProviderButton = [( localize(6294, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
+            const defaultProviderButton = [( localize(6354, "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(6294, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
+            const enterpriseProviderButton = [( localize(6354, "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(6294, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
-            const appleProviderButton = [( localize(6294, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
+            const googleProviderButton = [( localize(6354, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(6354, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
             if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
@@ -282,7 +289,7 @@ let ChatSetup = class ChatSetup {
                 ]);
             }
         } else {
-            buttons = [[( localize(6295, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(6355, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
         return buttons;
     }
@@ -292,22 +299,22 @@ let ChatSetup = class ChatSetup {
         }
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(6296, "Start using AI Features");
+                return localize(6356, "Start using AI Features");
             } else {
-                return localize(6297, "Enable more AI features");
+                return localize(6357, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(6298, "Sign in to use AI Features");
+            return localize(6358, "Sign in to use AI Features");
         }
-        return localize(6296, "Start using AI Features");
+        return localize(6356, "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(
-                6299,
+                6359,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -315,7 +322,7 @@ let ChatSetup = class ChatSetup {
             ));
         } else {
             footer = ( localize(
-                6300,
+                6360,
                 "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,

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

@@ -46,7 +46,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         this.environmentService = environmentService;
         this._store.add(slashCommandService.registerSlashCommand({
             command: "clear",
-            detail: ( localize(6301, "Start a new chat and archive the current one")),
+            detail: ( localize(6361, "Start a new chat and archive the current one")),
             sortText: "z2_clear",
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat]
@@ -56,7 +56,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "hooks",
-            detail: ( localize(6302, "Configure hooks")),
+            detail: ( localize(6362, "Configure hooks")),
             sortText: "z3_hooks",
             executeImmediately: true,
             silent: true,
@@ -67,7 +67,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "models",
-            detail: ( localize(6303, "Open the model picker")),
+            detail: ( localize(6363, "Open the model picker")),
             sortText: "z3_models",
             executeImmediately: true,
             silent: true,
@@ -77,7 +77,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "tools",
-            detail: ( localize(6304, "Configure tools")),
+            detail: ( localize(6364, "Configure tools")),
             sortText: "z3_tools",
             executeImmediately: true,
             silent: true,
@@ -88,7 +88,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "plugins",
-            detail: ( localize(6305, "Manage plugins")),
+            detail: ( localize(6365, "Manage plugins")),
             sortText: "z3_plugins",
             executeImmediately: true,
             silent: true,
@@ -100,7 +100,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         if (!this.environmentService.isSessionsWindow) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "debug",
-                detail: ( localize(6306, "Show Chat Debug View")),
+                detail: ( localize(6366, "Show Chat Debug View")),
                 sortText: "z3_debug",
                 executeImmediately: true,
                 silent: true,
@@ -111,7 +111,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }
         this._store.add(slashCommandService.registerSlashCommand({
             command: "agents",
-            detail: ( localize(6307, "Configure custom agents")),
+            detail: ( localize(6367, "Configure custom agents")),
             sortText: "z3_agents",
             executeImmediately: true,
             silent: true,
@@ -122,7 +122,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "skills",
-            detail: ( localize(6308, "Configure skills")),
+            detail: ( localize(6368, "Configure skills")),
             sortText: "z3_skills",
             executeImmediately: true,
             silent: true,
@@ -133,7 +133,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "instructions",
-            detail: ( localize(6309, "Configure instructions")),
+            detail: ( localize(6369, "Configure instructions")),
             sortText: "z3_instructions",
             executeImmediately: true,
             silent: true,
@@ -144,7 +144,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "prompts",
-            detail: ( localize(6310, "Configure prompt files")),
+            detail: ( localize(6370, "Configure prompt files")),
             sortText: "z3_prompts",
             executeImmediately: true,
             silent: true,
@@ -155,7 +155,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "fork",
-            detail: ( localize(6311, "Fork conversation into a new chat session")),
+            detail: ( localize(6371, "Fork conversation into a new chat session")),
             sortText: "z2_fork",
             executeImmediately: true,
             silent: true,
@@ -166,7 +166,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "rename",
-            detail: ( localize(6312, "Rename this chat")),
+            detail: ( localize(6372, "Rename this chat")),
             sortText: "z2_rename",
             executeImmediately: false,
             silent: true,
@@ -188,7 +188,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         if (autoApprovePolicyValue !== false) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "autoApprove",
-                detail: ( localize(6313, "Set permissions to bypass approvals")),
+                detail: ( localize(6373, "Set permissions to bypass approvals")),
                 sortText: "z1_autoApprove",
                 executeImmediately: true,
                 silent: true,
@@ -199,7 +199,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableAutoApprove",
-                detail: ( localize(6314, "Set permissions back to default")),
+                detail: ( localize(6374, "Set permissions back to default")),
                 sortText: "z1_disableAutoApprove",
                 executeImmediately: true,
                 silent: true,
@@ -210,7 +210,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "yolo",
-                detail: ( localize(6315, "Set permissions to bypass approvals")),
+                detail: ( localize(6375, "Set permissions to bypass approvals")),
                 sortText: "z1_yolo",
                 executeImmediately: true,
                 silent: true,
@@ -221,7 +221,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableYolo",
-                detail: ( localize(6316, "Set permissions back to default")),
+                detail: ( localize(6376, "Set permissions back to default")),
                 sortText: "z1_disableYolo",
                 executeImmediately: true,
                 silent: true,
@@ -233,7 +233,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             if (configurationService.getValue(ChatConfiguration.AutopilotEnabled) !== false) {
                 this._store.add(slashCommandService.registerSlashCommand({
                     command: "autopilot",
-                    detail: ( localize(6317, "Set permissions to autopilot mode")),
+                    detail: ( localize(6377, "Set permissions to autopilot mode")),
                     sortText: "z1_autopilot",
                     executeImmediately: true,
                     silent: true,
@@ -244,7 +244,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
                 }));
                 this._store.add(slashCommandService.registerSlashCommand({
                     command: "exitAutopilot",
-                    detail: ( localize(6318, "Set permissions back to default")),
+                    detail: ( localize(6378, "Set permissions back to default")),
                     sortText: "z1_exitAutopilot",
                     executeImmediately: true,
                     silent: true,

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

@@ -2,7 +2,7 @@
 import { ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 
 function isNewUser(chatEntitlementService) {
-    return !chatEntitlementService.sentiment.installed ||
+    return !chatEntitlementService.sentiment.completed ||
         chatEntitlementService.entitlement === ChatEntitlement.Available;
 }
 

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

@@ -12,10 +12,19 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { DomWidget } from "../../../../../platform/domWidget/browser/domWidget.js";
 import { ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IChatStatusItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service";
-import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
+export interface IChatStatusDashboardOptions {
+    /** When true, disables the Inline Suggestions settings section (toggles for all files, language, next edit). */
+    disableInlineSuggestionsSettings?: boolean;
+    /** When true, disables the inline completions model selection section. */
+    disableModelSelection?: boolean;
+    /** When true, disables the inline completions provider options section. */
+    disableProviderOptions?: boolean;
+    /** When true, disables the completions snooze button. */
+    disableCompletionsSnooze?: boolean;
+}
 export declare class ChatStatusDashboard extends DomWidget {
+    private readonly options;
     private readonly chatEntitlementService;
     private readonly chatStatusItemService;
     private readonly commandService;
@@ -27,21 +36,19 @@ export declare class ChatStatusDashboard extends DomWidget {
     private readonly telemetryService;
     private readonly textResourceConfigurationService;
     private readonly inlineCompletionsService;
-    private readonly chatSessionsService;
     private readonly markdownRendererService;
     private readonly languageFeaturesService;
     private readonly quickInputService;
-    private readonly viewService;
     readonly element: HTMLElement;
     private readonly dateFormatter;
-    private readonly dateTimeFormatter;
+    private readonly timeFormatter;
     private readonly quotaPercentageFormatter;
     private readonly quotaOverageFormatter;
-    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);
+    constructor(options: IChatStatusDashboardOptions | undefined, chatEntitlementService: ChatEntitlementService, chatStatusItemService: IChatStatusItemService, commandService: ICommandService, configurationService: IConfigurationService, editorService: IEditorService, hoverService: IHoverService, languageService: ILanguageService, openerService: IOpenerService, telemetryService: ITelemetryService, textResourceConfigurationService: ITextResourceConfigurationService, inlineCompletionsService: IInlineCompletionsService, markdownRendererService: IMarkdownRendererService, languageFeaturesService: ILanguageFeaturesService, quickInputService: IQuickInputService);
     private render;
-    private getDisplayNameForChatSessionType;
+    private renderUsageContent;
+    private renderInlineSuggestionsContent;
     private canUseChat;
-    private getUsageTitle;
     private renderHeader;
     private renderContributedChatStatusItem;
     private renderTextPlus;