@codingame/monaco-vscode-katex-common 33.0.9 → 34.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.js

@@ -3,25 +3,30 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { $, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IActionWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service';
 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 { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { 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 { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { AgentSessionProviders, getAgentSessionProviderDescription, getAgentSessionProviderName, getAgentSessionProvider, isFirstPartyAgentSessionProvider, getAgentSessionProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { ChatConfiguration, getDefaultNewChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatInputPickerActionViewItem } from './chatInputPickerActionItem.js';
 
 const firstPartyCategory = {
-    label: ( localize(7648, "Agent Types")),
+    label: ( localize(7794, "Agent Types")),
     order: 1
 };
 const otherCategory = {
-    label: ( localize(7649, "Other")),
+    label: ( localize(7795, "Other")),
     order: 2
 };
 let SessionTypePickerActionItem = class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
@@ -36,11 +41,13 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
         chatSessionsService,
         commandService,
         openerService,
-        telemetryService
+        telemetryService,
+        chatEntitlementService,
+        configurationService
     ) {
         const actionProvider = {
             getActions: () => {
-                const currentType = this._getSelectedSessionType();
+                const currentType = this._getSelectedSessionType() ?? this._getDefaultSessionType();
                 const actions = [...( this._getAdditionalActions().map(a => ({
                     ...action,
                     ...a
@@ -49,18 +56,19 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
                     if (!this._isVisible(sessionTypeItem.type)) {
                         continue;
                     }
+                    const lockedForEntitlement = this._isLockedForEntitlement(sessionTypeItem.type);
                     actions.push({
                         ...action,
                         id: sessionTypeItem.commandId,
                         label: sessionTypeItem.label,
                         checked: currentType === sessionTypeItem.type,
                         icon: this._getSessionIcon(sessionTypeItem),
-                        enabled: this._isSessionTypeEnabled(sessionTypeItem.type),
+                        enabled: lockedForEntitlement ? false : this._isSessionTypeEnabled(sessionTypeItem.type),
                         category: this._getSessionCategory(sessionTypeItem),
-                        description: this._getSessionDescription(sessionTypeItem),
+                        description: lockedForEntitlement ? this._getUpgradeDescription() : this._getSessionDescription(sessionTypeItem),
                         tooltip: "",
                         hover: {
-                            content: sessionTypeItem.hoverDescription
+                            content: lockedForEntitlement ? this._getUpgradeHover() : sessionTypeItem.hoverDescription
                         },
                         run: async () => {
                             this._run(sessionTypeItem);
@@ -100,10 +108,20 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
         this.chatSessionsService = chatSessionsService;
         this.commandService = commandService;
         this.openerService = openerService;
+        this.chatEntitlementService = chatEntitlementService;
+        this.configurationService = configurationService;
         this._sessionTypeItems = [];
         this._register(this.chatSessionsService.onDidChangeAvailability(() => {
             this._updateAgentSessionItems();
         }));
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(ChatConfiguration.AgentHostDefaultChatProvider)) {
+                this._updateAgentSessionItems();
+                if (this.element) {
+                    this.renderLabel(this.element);
+                }
+            }
+        }));
         this._updateAgentSessionItems();
     }
     _run(sessionTypeItem) {
@@ -126,7 +144,7 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
         const learnMoreUrl = "https://code.visualstudio.com/docs/copilot/agents/overview";
         return {
             id: "workbench.action.chat.agentOverview.learnMore",
-            label: ( localize(7650, "Learn about agent types...")),
+            label: ( localize(7796, "Learn about agent types...")),
             tooltip: learnMoreUrl,
             class: undefined,
             enabled: true,
@@ -162,8 +180,19 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
                 });
             }
         }
+        const defaultType = this._getDefaultSessionType();
+        if (defaultType !== AgentSessionProviders.Local) {
+            const index = agentSessionItems.findIndex(item => item.type === defaultType);
+            if (index > 0) {
+                const [defaultItem] = agentSessionItems.splice(index, 1);
+                agentSessionItems.unshift(defaultItem);
+            }
+        }
         this._sessionTypeItems = agentSessionItems;
     }
+    _getDefaultSessionType() {
+        return getDefaultNewChatSessionType(this.configurationService, this.chatSessionsService);
+    }
     _isVisible(_type) {
         return true;
     }
@@ -173,6 +202,33 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
         }
         return !!this.chatSessionsService.getChatSessionContribution(type);
     }
+    _isLockedForEntitlement(type) {
+        if (type !== AgentSessionProviders.Cloud) {
+            return false;
+        }
+        const entitlement = this.chatEntitlementService.entitlement;
+        return entitlement === ChatEntitlement.Free || entitlement === ChatEntitlement.EDU;
+    }
+    _getUpgradeDescription() {
+        return (new MarkdownString(localize(7797, "[Upgrade](command:workbench.action.chat.upgradePlan)"), {
+            isTrusted: {
+                enabledCommands: ["workbench.action.chat.upgradePlan"]
+            }
+        }));
+    }
+    _getUpgradeHover() {
+        const hover = ( new MarkdownString("", {
+            isTrusted: {
+                enabledCommands: ["workbench.action.chat.upgradePlan"]
+            },
+            supportThemeIcons: true
+        }));
+        hover.appendMarkdown(( localize(
+            7798,
+            "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan) to delegate work to the cloud agent."
+        )));
+        return hover;
+    }
     _getSessionCategory(sessionTypeItem) {
         const knownType = getAgentSessionProvider(sessionTypeItem.type);
         return knownType && isFirstPartyAgentSessionProvider(knownType) ? firstPartyCategory : otherCategory;
@@ -197,7 +253,7 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
     }
     renderLabel(element) {
         this.setAriaLabelAttributes(element);
-        const currentType = this._getSelectedSessionType() ?? AgentSessionProviders.Local;
+        const currentType = this._getSelectedSessionType() ?? this._getDefaultSessionType();
         const knownType = getAgentSessionProvider(currentType);
         const label = knownType ? getAgentSessionProviderName(knownType) : (this.chatSessionsService.getChatSessionContribution(currentType)?.displayName ?? currentType);
         const icon = this._getSessionIcon({
@@ -209,11 +265,10 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
         const labelElements = [];
         labelElements.push(...renderLabelWithIcons(`$(${icon.id})`));
         labelElements.push($("span.chat-input-picker-label", undefined, label));
-        labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(element, ...labelElements);
         return null;
     }
 };
-SessionTypePickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IKeybindingService)), ( __param(6, IContextKeyService)), ( __param(7, IChatSessionsService)), ( __param(8, ICommandService)), ( __param(9, IOpenerService)), ( __param(10, ITelemetryService))], SessionTypePickerActionItem));
+SessionTypePickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IKeybindingService)), ( __param(6, IContextKeyService)), ( __param(7, IChatSessionsService)), ( __param(8, ICommandService)), ( __param(9, IOpenerService)), ( __param(10, ITelemetryService)), ( __param(11, IChatEntitlementService)), ( __param(12, IConfigurationService))], SessionTypePickerActionItem));
 
 export { SessionTypePickerActionItem };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/workspacePickerActionItem.js

@@ -48,10 +48,10 @@ let WorkspacePickerActionItem = class WorkspacePickerActionItem extends ChatInpu
                 actions.push({
                     ...action,
                     id: "workspace.openFolder",
-                    label: ( localize(7651, "Open Folder...")),
+                    label: ( localize(7799, "Open Folder...")),
                     checked: false,
                     enabled: true,
-                    tooltip: ( localize(7652, "Open Folder...")),
+                    tooltip: ( localize(7800, "Open Folder...")),
                     run: async () => {
                         this.commandService.executeCommand(this.delegate.openFolderCommand);
                     }
@@ -104,10 +104,7 @@ let WorkspacePickerActionItem = class WorkspacePickerActionItem extends ChatInpu
             labelElements.push($("span.chat-input-picker-label", undefined, label));
         } else {
             labelElements.push(...renderLabelWithIcons(`$(folder)`));
-            labelElements.push($("span.chat-input-picker-label", undefined, ( localize(7653, "Workspace"))));
-        }
-        if (!this.pickerOptions.hideChevrons.get()) {
-            labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));
+            labelElements.push($("span.chat-input-picker-label", undefined, ( localize(7801, "Workspace"))));
         }
         reset(element, ...labelElements);
         return null;