@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

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

@@ -137,7 +137,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(6090, "Ask questions about VS Code")).value,
+                ( localize2(6221, "Ask questions about VS Code")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -152,7 +152,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.workspace",
                 "workspace",
                 false,
-                ( localize2(6091, "Ask about your workspace")).value,
+                ( localize2(6222, "Ask about your workspace")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -167,7 +167,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.terminal.agent",
                 "terminal",
                 false,
-                ( localize2(6092, "Ask how to do something in the terminal")).value,
+                ( localize2(6223, "Ask how to do something in the terminal")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -178,9 +178,9 @@ let SetupAgent = class SetupAgent extends Disposable {
                 id: "setup_tools_createNewWorkspace",
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(6093, "New Workspace")),
+                displayName: ( localize(6224, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(6094, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(6225, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: "new",
                 when: ContextKeyExpr.true()
@@ -235,10 +235,10 @@ let SetupAgent = class SetupAgent extends Disposable {
         };
     }
     static {
-        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6095, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6226, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6096, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6227, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
@@ -381,7 +381,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(6097, "Getting chat ready")))),
+            content: ( new MarkdownString(( localize(6228, "Getting chat ready")))),
             shimmer: true
         });
         await this.forwardRequestToChat(
@@ -418,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(6098, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(6229, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -486,7 +486,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6099, "Chat is almost ready")))),
+                    content: ( new MarkdownString(( localize(6230, "Chat is almost ready")))),
                     shimmer: true
                 });
             }, 10000);
@@ -502,7 +502,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                     whenToolsModelReady
                 ])]);
                 if (ready === "panelGuidance") {
-                    const warningMessage = ( localize(6100, "Please try again."));
+                    const warningMessage = ( localize(6231, "Please try again."));
                     progress({
                         kind: "markdownContent",
                         content: ( new MarkdownString(warningMessage))
@@ -514,13 +514,13 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            6101,
+                            6232,
                             "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(
-                            6102,
+                            6233,
                             "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
@@ -587,15 +587,18 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
-                                title: ( localize(6103, "Show Details"))
+                                title: ( localize(6234, "Show Details"))
                             }
                         });
                     } else {
+                        this.logService.warn(
+                            defaultChat.outputChannelId ? `[chat setup] No output channel found for id '${defaultChat.outputChannelId}' to show details about chat setup timeout. Please ensure the ${defaultChat.chatExtensionId} extension is activated.` : "[chat setup] No output channel provided via product.json to show details about chat setup timeout."
+                        );
                         progress({
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                                title: ( localize(6104, "Restart")),
+                                title: ( localize(6235, "Restart")),
                                 arguments: [requestModel.session.sessionResource]
                             }
                         });
@@ -719,7 +722,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        6105,
+                        6236,
                         "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
                     )))),
@@ -729,7 +732,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6106, "Getting chat ready")))),
+                    content: ( new MarkdownString(( localize(6237, "Getting chat ready")))),
                     shimmer: true
                 });
                 break;
@@ -766,7 +769,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(6107, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(6238, "Chat setup failed."))))
                 });
             }
         }
@@ -920,13 +923,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(6108, "Generate"));
+                generateOrModifyTitle = ( localize(6239, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(6109, "Modify"));
+                generateOrModifyTitle = ( localize(6240, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -944,14 +947,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6110, "Fix")),
+                title: ( localize(6241, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6111, "Explain")),
+                title: ( localize(6242, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -974,7 +977,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6109, "Modify")),
+            title: ( localize(6240, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -985,7 +988,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6108, "Generate")),
+            title: ( localize(6239, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1004,7 +1007,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(6111, "Explain")),
+            title: ( localize(6242, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -1014,7 +1017,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(6110, "Fix")),
+            title: ( localize(6241, "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

@@ -18,7 +18,6 @@ export declare class ChatSetup {
     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;
@@ -32,7 +31,6 @@ export declare class ChatSetup {
         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

@@ -26,7 +26,6 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 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);
@@ -73,8 +72,7 @@ let ChatSetup = class ChatSetup {
                     accessor.get(IWorkspaceTrustRequestService),
                     accessor.get(IMarkdownRendererService),
                     accessor.get(IDefaultAccountService),
-                    accessor.get(IHostService),
-                    accessor.get(IWorkbenchAssignmentService)
+                    accessor.get(IHostService)
                 ));
             });
         }
@@ -92,8 +90,7 @@ let ChatSetup = class ChatSetup {
         workspaceTrustRequestService,
         markdownRendererService,
         defaultAccountService,
-        hostService,
-        experimentService
+        hostService
     ) {
         this.context = context;
         this.controller = controller;
@@ -107,7 +104,6 @@ let ChatSetup = class ChatSetup {
         this.markdownRendererService = markdownRendererService;
         this.defaultAccountService = defaultAccountService;
         this.hostService = hostService;
-        this.experimentService = experimentService;
         this.pendingRun = undefined;
         this.skipDialogOnce = false;
     }
@@ -132,7 +128,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(6112, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(6243, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({
@@ -227,8 +223,7 @@ let ChatSetup = class ChatSetup {
     }
     async showDialog(options) {
         const disposables = ( new DisposableStore());
-        const useCloseButton = options?.dialogHideSkip || (await this.experimentService.getTreatment("chatSetupDialogCloseButton"));
-        const buttons = this.getButtons(options, useCloseButton);
+        const buttons = this.getButtons(options);
         const dialog = disposables.add(( new Dialog(
             this.layoutService.activeContainer,
             this.getDialogTitle(options),
@@ -239,8 +234,8 @@ let ChatSetup = class ChatSetup {
                 detail: " ",
                 icon: options?.dialogIcon ?? Codicon.copilotLarge,
                 alignment: DialogContentsAlignment.Vertical,
-                cancelId: useCloseButton ? buttons.length : buttons.length - 1,
-                disableCloseButton: !useCloseButton,
+                cancelId: buttons.length,
+                disableCloseButton: false,
                 renderFooter: footer => footer.appendChild(this.createDialogFooter(disposables, options)),
                 buttonOptions: ( buttons.map(button => button[2]))
             }, this.keybindingService, this.layoutService, this.hostService)
@@ -251,26 +246,26 @@ let ChatSetup = class ChatSetup {
         disposables.dispose();
         return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
     }
-    getButtons(options, useCloseButton) {
+    getButtons(options) {
         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(6113, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
+            const defaultProviderButton = [( localize(6244, "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(6113, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
+            const enterpriseProviderButton = [( localize(6244, "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(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")];
+            const googleProviderButton = [( localize(6244, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(6244, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
             if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
@@ -287,10 +282,7 @@ let ChatSetup = class ChatSetup {
                 ]);
             }
         } else {
-            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 = [[( localize(6245, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
         return buttons;
     }
@@ -300,22 +292,22 @@ let ChatSetup = class ChatSetup {
         }
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(6116, "Start using AI Features");
+                return localize(6246, "Start using AI Features");
             } else {
-                return localize(6117, "Enable more AI features");
+                return localize(6247, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(6118, "Sign in to use AI Features");
+            return localize(6248, "Sign in to use AI Features");
         }
-        return localize(6116, "Start using AI Features");
+        return localize(6246, "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(
-                6119,
+                6249,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -323,7 +315,7 @@ let ChatSetup = class ChatSetup {
             ));
         } else {
             footer = ( localize(
-                6120,
+                6250,
                 "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,
@@ -343,6 +335,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)), ( __param(11, IHostService)), ( __param(12, IWorkbenchAssignmentService))], 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))], ChatSetup));
 
 export { ChatSetup };

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

@@ -1,17 +1,15 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
-import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 export declare class ChatSlashCommandsContribution extends Disposable {
     private readonly environmentService;
     static readonly ID = "workbench.contrib.chatSlashCommands";
-    constructor(slashCommandService: IChatSlashCommandService, commandService: ICommandService, chatAgentService: IChatAgentService, instantiationService: IInstantiationService, agentSessionsService: IAgentSessionsService, chatService: IChatService, configurationService: IConfigurationService, dialogService: IDialogService, notificationService: INotificationService, storageService: IStorageService, environmentService: IWorkbenchEnvironmentService);
+    constructor(slashCommandService: IChatSlashCommandService, commandService: ICommandService, chatAgentService: IChatAgentService, instantiationService: IInstantiationService, agentSessionsService: IAgentSessionsService, chatService: IChatService, configurationService: IConfigurationService, chatWidgetService: IChatWidgetService, environmentService: IWorkbenchEnvironmentService);
 }