@codingame/monaco-vscode-chat-service-override 34.1.2 → 35.0.0

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

@@ -18,8 +18,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 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 { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
+import { IWorkspaceTrustRequestService, IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 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';
@@ -27,10 +26,14 @@ import { ChatSetupStrategy, ChatSetupAnonymous } from '@codingame/monaco-vscode-
 import { GitHubPaths } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount';
 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';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { raceTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 
 var ChatSetup_1;
 registerCss(chatSetup);
 const defaultChat = {
+    chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? "",
     publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? "",
     provider: product.defaultChatAgent?.provider ?? {
         default: {
@@ -59,22 +62,7 @@ let ChatSetup = class ChatSetup {
     static getInstance(instantiationService, context, controller) {
         let instance = ChatSetup_1.instance;
         if (!instance) {
-            instance = ChatSetup_1.instance = instantiationService.invokeFunction(accessor => {
-                return ( new ChatSetup_1(
-                    context,
-                    controller,
-                    accessor.get(ITelemetryService),
-                    accessor.get(IWorkbenchLayoutService),
-                    accessor.get(IKeybindingService),
-                    accessor.get(IChatEntitlementService),
-                    accessor.get(ILogService),
-                    accessor.get(IChatWidgetService),
-                    accessor.get(IWorkspaceTrustRequestService),
-                    accessor.get(IMarkdownRendererService),
-                    accessor.get(IDefaultAccountService),
-                    accessor.get(IHostService)
-                ));
-            });
+            instance = ChatSetup_1.instance = instantiationService.createInstance(ChatSetup_1, context, controller);
         }
         return instance;
     }
@@ -90,7 +78,9 @@ let ChatSetup = class ChatSetup {
         workspaceTrustRequestService,
         markdownRendererService,
         defaultAccountService,
-        hostService
+        hostService,
+        extensionService,
+        workspaceTrustManagementService
     ) {
         this.context = context;
         this.controller = controller;
@@ -104,6 +94,8 @@ let ChatSetup = class ChatSetup {
         this.markdownRendererService = markdownRendererService;
         this.defaultAccountService = defaultAccountService;
         this.hostService = hostService;
+        this.extensionService = extensionService;
+        this.workspaceTrustManagementService = workspaceTrustManagementService;
         this.pendingRun = undefined;
         this.skipDialogOnce = false;
     }
@@ -127,8 +119,9 @@ let ChatSetup = class ChatSetup {
         });
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
+        const wasTrusted = this.workspaceTrustManagementService.isWorkspaceTrusted();
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(6777, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(7282, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({
@@ -145,6 +138,9 @@ let ChatSetup = class ChatSetup {
                 success: undefined
             };
         }
+        if (!wasTrusted) {
+            await this.whenChatExtensionActivated();
+        }
         let setupStrategy;
         if (options?.setupStrategy !== undefined) {
             setupStrategy = options.setupStrategy;
@@ -231,6 +227,34 @@ let ChatSetup = class ChatSetup {
             dialogSkipped
         };
     }
+    isChatExtensionActivated() {
+        const status = this.extensionService.getExtensionsStatus();
+        for (const id of ( Object.keys(status))) {
+            if (ExtensionIdentifier.equals(id, defaultChat.chatExtensionId)) {
+                return status[id].activationTimes !== undefined;
+            }
+        }
+        return false;
+    }
+    async whenChatExtensionActivated(timeoutMs = 10000) {
+        if (!defaultChat.chatExtensionId || this.isChatExtensionActivated()) {
+            return;
+        }
+        const store = ( new DisposableStore());
+        try {
+            await raceTimeout(( new Promise(resolve => {
+                const check = () => {
+                    if (this.isChatExtensionActivated()) {
+                        resolve();
+                    }
+                };
+                store.add(this.extensionService.onDidChangeExtensionsStatus(check));
+                this.extensionService.whenInstalledExtensionsRegistered().then(check);
+            })), timeoutMs);
+        } finally {
+            store.dispose();
+        }
+    }
     async showDialog(options) {
         const disposables = ( new DisposableStore());
         const buttons = this.getButtons(options);
@@ -262,20 +286,20 @@ let ChatSetup = class ChatSetup {
         });
         let buttons;
         if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
-            const defaultProviderButton = [( localize(6778, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
+            const defaultProviderButton = [( localize(7283, "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(6778, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
+            const enterpriseProviderButton = [( localize(7283, "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(6778, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
-            const appleProviderButton = [( localize(6778, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
+            const googleProviderButton = [( localize(7283, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(7283, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
             if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
@@ -292,7 +316,7 @@ let ChatSetup = class ChatSetup {
                 ]);
             }
         } else {
-            buttons = [[( localize(6779, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(7284, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
         return buttons;
     }
@@ -302,22 +326,22 @@ let ChatSetup = class ChatSetup {
         }
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(6780, "Start using AI Features");
+                return localize(7285, "Start using AI Features");
             } else {
-                return localize(6781, "Enable more AI features");
+                return localize(7286, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(6782, "Sign in to use GitHub Copilot");
+            return localize(7287, "Sign in to use GitHub Copilot");
         }
-        return localize(6780, "Start using AI Features");
+        return localize(7285, "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(
-                6783,
+                7288,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -325,7 +349,7 @@ let ChatSetup = class ChatSetup {
             ));
         } else {
             footer = ( localize(
-                6784,
+                7289,
                 "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,
@@ -345,6 +369,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))], ChatSetup));
+ChatSetup = ChatSetup_1 = ( __decorate([( __param(2, ITelemetryService)), ( __param(3, ILayoutService)), ( __param(4, IKeybindingService)), ( __param(5, IChatEntitlementService)), ( __param(6, ILogService)), ( __param(7, IChatWidgetService)), ( __param(8, IWorkspaceTrustRequestService)), ( __param(9, IMarkdownRendererService)), ( __param(10, IDefaultAccountService)), ( __param(11, IHostService)), ( __param(12, IExtensionService)), ( __param(13, IWorkspaceTrustManagementService))], ChatSetup));
 
 export { ChatSetup };

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

@@ -63,7 +63,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         this.environmentService = environmentService;
         this._store.add(slashCommandService.registerSlashCommand({
             command: "clear",
-            detail: ( localize(6785, "Start a new chat and archive the current one")),
+            detail: ( localize(7290, "Start a new chat and archive the current one")),
             sortText: "z2_clear",
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat]
@@ -73,7 +73,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "hooks",
-            detail: ( localize(6786, "Configure hooks")),
+            detail: ( localize(7291, "Configure hooks")),
             sortText: "z3_hooks",
             executeImmediately: true,
             silent: true,
@@ -91,7 +91,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "models",
-            detail: ( localize(6787, "Open the model picker")),
+            detail: ( localize(7292, "Open the model picker")),
             sortText: "z3_models",
             executeImmediately: true,
             silent: true,
@@ -101,7 +101,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "tools",
-            detail: ( localize(6788, "Configure tools")),
+            detail: ( localize(7293, "Configure tools")),
             sortText: "z3_tools",
             executeImmediately: true,
             silent: true,
@@ -112,7 +112,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "plugins",
-            detail: ( localize(6789, "Manage plugins")),
+            detail: ( localize(7294, "Manage plugins")),
             sortText: "z3_plugins",
             executeImmediately: true,
             silent: true,
@@ -124,7 +124,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         if (!this.environmentService.isSessionsWindow) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "debug",
-                detail: ( localize(6790, "Show Chat Debug View")),
+                detail: ( localize(7295, "Show Chat Debug View")),
                 sortText: "z3_debug",
                 executeImmediately: true,
                 silent: true,
@@ -135,7 +135,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }
         this._store.add(slashCommandService.registerSlashCommand({
             command: "agents",
-            detail: ( localize(6791, "Configure custom agents")),
+            detail: ( localize(7296, "Configure custom agents")),
             sortText: "z3_agents",
             executeImmediately: true,
             silent: true,
@@ -153,7 +153,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "skills",
-            detail: ( localize(6792, "Configure skills")),
+            detail: ( localize(7297, "Configure skills")),
             sortText: "z3_skills",
             executeImmediately: true,
             silent: true,
@@ -171,7 +171,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "instructions",
-            detail: ( localize(6793, "Configure instructions")),
+            detail: ( localize(7298, "Configure instructions")),
             sortText: "z3_instructions",
             executeImmediately: true,
             silent: true,
@@ -189,7 +189,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "prompts",
-            detail: ( localize(6794, "Configure prompt files")),
+            detail: ( localize(7299, "Configure prompt files")),
             sortText: "z3_prompts",
             executeImmediately: true,
             silent: true,
@@ -207,7 +207,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "fork",
-            detail: ( localize(6795, "Fork conversation into a new chat session")),
+            detail: ( localize(7300, "Fork conversation into a new chat session")),
             sortText: "z2_fork",
             executeImmediately: true,
             silent: true,
@@ -218,7 +218,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "rename",
-            detail: ( localize(6796, "Rename this chat")),
+            detail: ( localize(7301, "Rename this chat")),
             sortText: "z2_rename",
             executeImmediately: false,
             silent: true,
@@ -269,7 +269,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         if (autoApprovePolicyValue !== false) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "autoApprove",
-                detail: ( localize(6797, "Set permissions to bypass approvals")),
+                detail: ( localize(7302, "Set permissions to bypass approvals")),
                 sortText: "z1_autoApprove",
                 executeImmediately: true,
                 silent: true,
@@ -280,7 +280,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableAutoApprove",
-                detail: ( localize(6798, "Set permissions back to default")),
+                detail: ( localize(7303, "Set permissions back to default")),
                 sortText: "z1_disableAutoApprove",
                 executeImmediately: true,
                 silent: true,
@@ -291,7 +291,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "yolo",
-                detail: ( localize(6799, "Set permissions to bypass approvals")),
+                detail: ( localize(7304, "Set permissions to bypass approvals")),
                 sortText: "z1_yolo",
                 executeImmediately: true,
                 silent: true,
@@ -302,7 +302,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableYolo",
-                detail: ( localize(6800, "Set permissions back to default")),
+                detail: ( localize(7305, "Set permissions back to default")),
                 sortText: "z1_disableYolo",
                 executeImmediately: true,
                 silent: true,
@@ -313,7 +313,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "autopilot",
-                detail: ( localize(6801, "Set permissions to autopilot mode")),
+                detail: ( localize(7306, "Set permissions to autopilot mode")),
                 sortText: "z1_autopilot",
                 executeImmediately: true,
                 silent: true,
@@ -324,7 +324,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "exitAutopilot",
-                detail: ( localize(6802, "Set permissions back to default")),
+                detail: ( localize(7307, "Set permissions back to default")),
                 sortText: "z1_exitAutopilot",
                 executeImmediately: true,
                 silent: true,
@@ -455,7 +455,7 @@ let ChatSessionOptionSlashCommandsContribution = class ChatSessionOptionSlashCom
     registerOne(chatSessionType, group, item, name) {
         return this.slashCommandService.registerSlashCommand({
             command: name,
-            detail: item.description ?? ( localize(6803, "Switch to '{0}'", item.name)),
+            detail: item.description ?? ( localize(7308, "Switch to '{0}'", item.name)),
             sortText: `z1_${name}`,
             executeImmediately: true,
             silent: true,

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

@@ -65,7 +65,6 @@ export declare class ChatStatusDashboard extends DomWidget {
     private readonly storageService;
     private readonly defaultAccountService;
     private static readonly QUICK_SETTINGS_COLLAPSED_KEY;
-    private static readonly HIDDEN_ENTRY_IDS;
     readonly element: HTMLElement;
     private readonly dateFormatter;
     private readonly timeFormatter;