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

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

@@ -29,6 +29,8 @@ import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { semverExports } from '@codingame/monaco-vscode-api/_virtual/semver';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+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 { StateType } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update';
 import { IUpdateService } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -48,20 +50,20 @@ function getUpdateHoverContent(updateState) {
     switch (updateState) {
     case StateType.AvailableForDownload:
         hoverContent.appendMarkdown(( localize(
-            7468,
+            7547,
             "This model requires a newer version of VS Code. [Download Update](command:update.downloadUpdate) to access it."
         )));
         break;
     case StateType.Downloaded:
     case StateType.Ready:
         hoverContent.appendMarkdown(( localize(
-            7469,
+            7548,
             "This model requires a newer version of VS Code. [Restart to Update](command:update.restartToUpdate) to access it."
         )));
         break;
     default:
         hoverContent.appendMarkdown(( localize(
-            7470,
+            7549,
             "This model requires a newer version of VS Code. [Update VS Code](command:update.checkForUpdate) to access it."
         )));
         break;
@@ -110,13 +112,22 @@ function getProviderGroupForModel(model, modelToGroup, languageModelsService) {
 function isMultiplierPricing(model) {
     return model.metadata.multiplierNumeric !== undefined;
 }
-function createModelItem(action, model, descriptionOverride, openerService, vendorLabel, isUBB) {
+function createModelItem(
+    action,
+    model,
+    openerService,
+    vendorLabel,
+    isUBB,
+    ariaDescription,
+    pinAction
+) {
     const hover = model && openerService ? getModelHoverContent(model, openerService, isUBB) : undefined;
     return {
         item: action,
         kind: ActionListItemKind.Action,
         label: action.label,
-        description: descriptionOverride ?? action.description,
+        description: action.description,
+        ariaDescription,
         group: {
             title: "",
             icon: action.icon ?? ThemeIcon.fromId(action.checked ? Codicon.check.id : Codicon.blank.id)
@@ -130,9 +141,18 @@ function createModelItem(action, model, descriptionOverride, openerService, vend
             disposable: hover.disposable
         } : undefined,
         tooltip: action.tooltip,
+        toolbarActions: pinAction ? [pinAction] : undefined,
         submenuActions: action.toolbarActions?.length ? action.toolbarActions : undefined
     };
 }
+function createPinAction(modelIdentifier, isPinned, onTogglePin) {
+    return toAction({
+        id: `pin.${modelIdentifier}`,
+        label: isPinned ? ( localize(7550, "Unpin Model")) : ( localize(7551, "Pin Model")),
+        class: ThemeIcon.asClassName(isPinned ? Codicon.pinned : Codicon.pin),
+        run: () => onTogglePin(modelIdentifier, !isPinned)
+    });
+}
 function resolveConfigProperty(model, group, languageModelsService) {
     const schema = model.metadata.configurationSchema;
     if (!schema?.properties) {
@@ -155,26 +175,19 @@ function resolveConfigProperty(model, group, languageModelsService) {
     }
     return undefined;
 }
-function getPriceCategoryIndicator(priceCategory) {
-    let filled;
+function getPriceCategoryLabel(priceCategory) {
     switch (priceCategory) {
     case "low":
-        filled = 1;
-        break;
+        return localize(7552, "Low cost");
     case "medium":
-        filled = 2;
-        break;
+        return localize(7553, "Medium cost");
     case "high":
-        filled = 3;
-        break;
+        return localize(7554, "High cost");
     case "very_high":
-        filled = 4;
-        break;
+        return localize(7555, "Very high cost");
     default:
         return undefined;
     }
-    const total = 4;
-    return "$(circle-filled)".repeat(filled) + "$(circle)".repeat(total - filled);
 }
 function getModelConfigurationDescription(model, languageModelsService) {
     const schema = model.metadata.configurationSchema;
@@ -210,23 +223,11 @@ function createModelAction(
     isUBB
 ) {
     const pricingForDescription = isMultiplierPricing(model) ? model.metadata.pricing : undefined;
-    const priceCategoryIndicator = isUBB ? getPriceCategoryIndicator(model.metadata.priceCategory) : undefined;
+    const priceCategoryLabel = isUBB ? getPriceCategoryLabel(model.metadata.priceCategory) : undefined;
     const configDescription = !isUBB ? getModelConfigurationDescription(model, languageModelsService) : undefined;
     const detail = suppressVendorInDetail ? undefined : model.metadata.detail;
     const textParts = [configDescription, detail, pricingForDescription].filter(Boolean);
     const textDescription = textParts.length > 0 ? textParts.join(" · ") : undefined;
-    let descriptionOverride;
-    if (priceCategoryIndicator) {
-        const md = ( new MarkdownString("", {
-            isTrusted: false,
-            supportThemeIcons: true
-        }));
-        if (textDescription) {
-            md.appendText(textDescription + " · ");
-        }
-        md.appendMarkdown(priceCategoryIndicator);
-        descriptionOverride = md;
-    }
     const toolbarActions = !isUBB ? languageModelsService.getModelConfigurationActions(model.identifier) : undefined;
     const action = {
         id: model.identifier,
@@ -234,20 +235,21 @@ function createModelAction(
         icon: model.metadata.statusIcon,
         checked: model.identifier === selectedModelId,
         class: undefined,
-        description: priceCategoryIndicator ? undefined : textDescription,
+        description: textDescription,
         tooltip: model.metadata.name,
         label: model.metadata.name,
         section,
         toolbarActions: toolbarActions && toolbarActions.length > 0 ? toolbarActions : undefined,
         run: () => onSelect(model)
     };
+    const ariaDescription = priceCategoryLabel ? (textDescription ? textDescription + " · " + priceCategoryLabel : priceCategoryLabel) : undefined;
     return {
         action,
-        descriptionOverride
+        ariaDescription
     };
 }
 function shouldShowManageModelsAction(chatEntitlementService) {
-    return chatEntitlementService.entitlement === ChatEntitlement.Free || chatEntitlementService.entitlement === ChatEntitlement.EDU || chatEntitlementService.entitlement === ChatEntitlement.Pro || chatEntitlementService.entitlement === ChatEntitlement.ProPlus || chatEntitlementService.entitlement === ChatEntitlement.Max || chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise || chatEntitlementService.isInternal;
+    return chatEntitlementService.hasByokModels || chatEntitlementService.entitlement === ChatEntitlement.Free || chatEntitlementService.entitlement === ChatEntitlement.EDU || chatEntitlementService.entitlement === ChatEntitlement.Pro || chatEntitlementService.entitlement === ChatEntitlement.ProPlus || chatEntitlementService.entitlement === ChatEntitlement.Max || chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise || chatEntitlementService.isInternal;
 }
 function createManageModelsAction(commandService) {
     return {
@@ -255,8 +257,8 @@ function createManageModelsAction(commandService) {
         enabled: true,
         checked: false,
         class: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(7471, "Manage Language Models")),
-        label: ( localize(7472, "Manage Models...")),
+        tooltip: ( localize(7556, "Manage Language Models")),
+        label: ( localize(7557, "Manage Models...")),
         run: () => {
             commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
         }
@@ -266,10 +268,12 @@ function buildModelPickerItems(
     models,
     selectedModelId,
     recentModelIds,
+    pinnedModelIds,
     controlModels,
     currentVSCodeVersion,
     updateStateType,
     onSelect,
+    onTogglePin,
     manageSettingsUrl,
     useGroupedModelPicker,
     manageModelsAction,
@@ -287,8 +291,8 @@ function buildModelPickerItems(
             enabled: true,
             checked: true,
             class: undefined,
-            tooltip: ( localize(7473, "Auto")),
-            label: ( localize(7473, "Auto")),
+            tooltip: ( localize(7558, "Auto")),
+            label: ( localize(7558, "Auto")),
             run: () => {}
         }));
     }
@@ -325,7 +329,7 @@ function buildModelPickerItems(
                 markPlaced(autoModel.identifier, autoModel.metadata.id);
                 const {
                     action: autoAction,
-                    descriptionOverride: autoDesc
+                    ariaDescription: autoAriaDesc
                 } = createModelAction(
                     autoModel,
                     selectedModelId,
@@ -336,9 +340,58 @@ function buildModelPickerItems(
                     isUBB
                 );
                 items.push(
-                    createModelItem(autoAction, autoModel, autoDesc, openerService, undefined, isUBB)
+                    createModelItem(autoAction, autoModel, openerService, undefined, isUBB, autoAriaDesc)
                 );
             }
+            const allGroupKeys = ( new Set(( models.map(m => {
+                const info = getProviderGroupForModel(m, modelToGroup, languageModelsService);
+                return getProviderGroupKey(info.vendor, info.groupName);
+            }))));
+            const showGroupLabel = allGroupKeys.size > 1;
+            const makePinAction = model => onTogglePin ? createPinAction(model.identifier, pinnedModelIds.includes(model.identifier), onTogglePin) : undefined;
+            const pinnedSet = ( new Set(pinnedModelIds));
+            const pinnedModels = [];
+            for (const id of pinnedModelIds) {
+                if (( placed.has(id))) {
+                    continue;
+                }
+                const model = resolveModel(id);
+                if (model && !( placed.has(model.identifier))) {
+                    markPlaced(model.identifier, model.metadata.id);
+                    pinnedModels.push(model);
+                }
+            }
+            if (pinnedModels.length > 0) {
+                items.push({
+                    kind: ActionListItemKind.Separator,
+                    label: ( localize(7559, "Pinned"))
+                });
+                for (const model of pinnedModels) {
+                    const groupLabel = showGroupLabel ? getProviderGroupForModel(model, modelToGroup, languageModelsService).groupName : undefined;
+                    const {
+                        action: pinnedAction,
+                        ariaDescription: pinnedAriaDesc
+                    } = createModelAction(
+                        model,
+                        selectedModelId,
+                        onSelect,
+                        languageModelsService,
+                        undefined,
+                        showGroupLabel,
+                        isUBB
+                    );
+                    items.push(createModelItem(
+                        pinnedAction,
+                        model,
+                        openerService,
+                        groupLabel,
+                        isUBB,
+                        pinnedAriaDesc,
+                        makePinAction(model)
+                    ));
+                }
+            }
+            const filteredRecentIds = recentModelIds.filter(id => !( pinnedSet.has(id))).slice(0, 3);
             const promotedItems = [];
             const tryPlaceModel = id => {
                 if (( placed.has(id))) {
@@ -381,7 +434,7 @@ function buildModelPickerItems(
             if (selectedModelId && selectedModelId !== autoModel?.identifier) {
                 tryPlaceModel(selectedModelId);
             }
-            for (const id of recentModelIds) {
+            for (const id of filteredRecentIds) {
                 tryPlaceModel(id);
             }
             if (showFeatured) {
@@ -422,6 +475,11 @@ function buildModelPickerItems(
                 }
             }
             if (promotedItems.length > 0) {
+                if (items.length > 0) {
+                    items.push({
+                        kind: ActionListItemKind.Separator
+                    });
+                }
                 promotedItems.sort((a, b) => {
                     const aAvail = a.kind === "available" ? 0 : 1;
                     const bAvail = b.kind === "available" ? 0 : 1;
@@ -432,29 +490,30 @@ function buildModelPickerItems(
                     const bName = b.kind === "available" ? b.model.metadata.name : b.entry.label;
                     return aName.localeCompare(bName);
                 });
-                const allGroupKeys = ( new Set(( models.map(m => {
-                    const info = getProviderGroupForModel(m, modelToGroup, languageModelsService);
-                    return getProviderGroupKey(info.vendor, info.groupName);
-                }))));
-                const showPromotedGroupLabel = allGroupKeys.size > 1;
                 for (const item of promotedItems) {
                     if (item.kind === "available") {
-                        const groupLabel = showPromotedGroupLabel ? getProviderGroupForModel(item.model, modelToGroup, languageModelsService).groupName : undefined;
+                        const groupLabel = showGroupLabel ? getProviderGroupForModel(item.model, modelToGroup, languageModelsService).groupName : undefined;
                         const {
                             action: promotedAction,
-                            descriptionOverride: promotedDesc
+                            ariaDescription: promotedAriaDesc
                         } = createModelAction(
                             item.model,
                             selectedModelId,
                             onSelect,
                             languageModelsService,
                             undefined,
-                            showPromotedGroupLabel,
+                            showGroupLabel,
                             isUBB
                         );
-                        items.push(
-                            createModelItem(promotedAction, item.model, promotedDesc, openerService, groupLabel, isUBB)
-                        );
+                        items.push(createModelItem(
+                            promotedAction,
+                            item.model,
+                            openerService,
+                            groupLabel,
+                            isUBB,
+                            promotedAriaDesc,
+                            makePinAction(item.model)
+                        ));
                     } else {
                         items.push(createUnavailableModelItem(
                             item.id,
@@ -486,12 +545,12 @@ function buildModelPickerItems(
                         enabled: true,
                         checked: false,
                         class: undefined,
-                        tooltip: ( localize(7474, "Other Models")),
-                        label: ( localize(7474, "Other Models")),
+                        tooltip: ( localize(7560, "Other Models")),
+                        label: ( localize(7560, "Other Models")),
                         run: () => {}
                     },
                     kind: ActionListItemKind.Action,
-                    label: ( localize(7474, "Other Models")),
+                    label: ( localize(7560, "Other Models")),
                     group: {
                         title: "",
                         icon: Codicon.chevronDown
@@ -560,7 +619,7 @@ function buildModelPickerItems(
                         } else {
                             const {
                                 action: bucketAction,
-                                descriptionOverride: bucketDesc
+                                ariaDescription: bucketAriaDesc
                             } = createModelAction(
                                 model,
                                 selectedModelId,
@@ -570,9 +629,15 @@ function buildModelPickerItems(
                                 showGroupHeaders,
                                 isUBB
                             );
-                            items.push(
-                                createModelItem(bucketAction, model, bucketDesc, openerService, undefined, isUBB)
-                            );
+                            items.push(createModelItem(
+                                bucketAction,
+                                model,
+                                openerService,
+                                undefined,
+                                isUBB,
+                                bucketAriaDesc,
+                                makePinAction(model)
+                            ));
                         }
                     }
                 }
@@ -599,7 +664,7 @@ function buildModelPickerItems(
         if (autoModel) {
             const {
                 action: flatAutoAction,
-                descriptionOverride: flatAutoDesc
+                ariaDescription: flatAutoAriaDesc
             } = createModelAction(
                 autoModel,
                 selectedModelId,
@@ -609,9 +674,14 @@ function buildModelPickerItems(
                 undefined,
                 isUBB
             );
-            items.push(
-                createModelItem(flatAutoAction, autoModel, flatAutoDesc, openerService, undefined, isUBB)
-            );
+            items.push(createModelItem(
+                flatAutoAction,
+                autoModel,
+                openerService,
+                undefined,
+                isUBB,
+                flatAutoAriaDesc
+            ));
         }
         const sortedModels = models.filter(m => m !== autoModel).sort((a, b) => {
             const vendorCmp = a.metadata.vendor.localeCompare(b.metadata.vendor);
@@ -620,7 +690,7 @@ function buildModelPickerItems(
         for (const model of sortedModels) {
             const {
                 action: flatAction,
-                descriptionOverride: flatDesc
+                ariaDescription: flatAriaDesc
             } = createModelAction(
                 model,
                 selectedModelId,
@@ -631,7 +701,7 @@ function buildModelPickerItems(
                 isUBB
             );
             items.push(
-                createModelItem(flatAction, model, flatDesc, openerService, undefined, isUBB)
+                createModelItem(flatAction, model, openerService, undefined, isUBB, flatAriaDesc)
             );
         }
     }
@@ -643,7 +713,7 @@ function getModelPickerAccessibilityProvider() {
             if (element.kind !== ActionListItemKind.Action) {
                 return null;
             }
-            const description = typeof element.description === "string" ? element.description : element.description?.value;
+            const description = element.ariaDescription ?? (typeof element.description === "string" ? element.description : element.description?.value);
             return [element.label, element.badge, description].filter(part => !!part).join(", ");
         },
         isChecked(element) {
@@ -679,15 +749,15 @@ function createUnavailableModelItem(
 ) {
     let description;
     if (reason === "upgrade") {
-        description = ( new MarkdownString(( localize(7475, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
+        description = ( new MarkdownString(( localize(7561, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
             isTrusted: true
         }));
     } else if (reason === "update") {
-        description = ( localize(7476, "Update VS Code"));
+        description = ( localize(7562, "Update VS Code"));
     } else {
-        description = manageSettingsUrl ? ( new MarkdownString(( localize(7477, "[Contact your admin]({0})", manageSettingsUrl)), {
+        description = manageSettingsUrl ? ( new MarkdownString(( localize(7563, "[Contact your admin]({0})", manageSettingsUrl)), {
             isTrusted: true
-        })) : ( localize(7478, "Contact your admin"));
+        })) : ( localize(7564, "Contact your admin"));
     }
     let hoverContent;
     if (reason === "upgrade") {
@@ -697,12 +767,12 @@ function createUnavailableModelItem(
         }));
         if (chatEntitlementService.entitlement === ChatEntitlement.Pro) {
             hoverContent.appendMarkdown(( localize(
-                7479,
+                7565,
                 "[Upgrade to GitHub Copilot Pro+](command:workbench.action.chat.upgradePlan \" \") to use the best models."
             )));
         } else {
             hoverContent.appendMarkdown(( localize(
-                7480,
+                7566,
                 "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan \" \") to use the best models."
             )));
         }
@@ -714,7 +784,7 @@ function createUnavailableModelItem(
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            7481,
+            7567,
             "This model is not available. Contact your administrator to enable it."
         )));
     }
@@ -765,7 +835,8 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         _productService,
         _entitlementService,
         _updateService,
-        _uriIdentityService
+        _uriIdentityService,
+        _defaultAccountService
     ) {
         super();
         this._delegate = _delegate;
@@ -778,18 +849,14 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         this._entitlementService = _entitlementService;
         this._updateService = _updateService;
         this._uriIdentityService = _uriIdentityService;
+        this._defaultAccountService = _defaultAccountService;
         this._onDidChangeSelection = this._register(( new Emitter()));
         this.onDidChangeSelection = this._onDidChangeSelection.event;
         this._register(this._languageModelsService.onDidChangeLanguageModels(() => {
             this._renderLabel();
         }));
-        let lastIsUBB = !!this._entitlementService.quotas.usageBasedBilling;
-        this._register(this._entitlementService.onDidChangeQuotaRemaining(() => {
-            const currentIsUBB = !!this._entitlementService.quotas.usageBasedBilling;
-            if (currentIsUBB !== lastIsUBB) {
-                lastIsUBB = currentIsUBB;
-                this._renderLabel();
-            }
+        this._register(this._entitlementService.onDidChangeUsageBasedBilling(() => {
+            this._renderLabel();
         }));
     }
     setHideChevrons(hideChevrons) {
@@ -846,10 +913,10 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         this._registerButtonAction(this._effortButton, () => this._showEffortPicker());
         this._registerButtonAction(this._tokensButton, () => this._showTokensPicker());
         this._register(
-            getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this._effortButton, ( localize(7482, "Set Thinking Effort")))
+            getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this._effortButton, ( localize(7568, "Set Thinking Effort")))
         );
         this._register(
-            getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this._tokensButton, ( localize(7483, "Set Context Size")))
+            getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this._tokensButton, ( localize(7569, "Set Context Size")))
         );
     }
     _registerButtonAction(element, action) {
@@ -895,15 +962,26 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 interaction
             });
         };
-        const manageSettingsUrl = this._productService.defaultChatAgent?.manageSettingsUrl;
+        const manageSettingsUrl = this._defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotSettings);
+        const onTogglePin = (modelIdentifier, pinned) => {
+            if (pinned) {
+                this._languageModelsService.pinModel(modelIdentifier);
+            } else {
+                this._languageModelsService.unpinModel(modelIdentifier);
+            }
+            this._actionWidgetService.hide();
+            this.show(anchorElement);
+        };
         const items = buildModelPickerItems(
             models,
             this._selectedModel?.identifier,
             this._languageModelsService.getRecentlyUsedModelIds(),
+            this._languageModelsService.getPinnedModelIds(),
             controlModelsForTier,
             this._productService.version,
             this._updateService.state.type,
             onSelect,
+            onTogglePin,
             manageSettingsUrl,
             this._delegate.useGroupedModelPicker(),
             isUBB ? manageModelsAction : undefined,
@@ -914,12 +992,16 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             this._openerService,
             isUBB
         );
-        const hasPriceCategories = ( models.some(m => !!m.metadata.priceCategory));
+        const hoverDisposables = ( new DisposableStore());
+        for (const item of items) {
+            if (item.hover?.disposable) {
+                hoverDisposables.add(item.hover.disposable);
+            }
+        }
         const listOptions = {
             showFilter: true,
-            filterPlaceholder: ( localize(7484, "Search models")),
+            filterPlaceholder: ( localize(7570, "Search models")),
             filterActions: !isUBB && manageModelsAction ? [manageModelsAction] : undefined,
-            secondaryHeading: isUBB && hasPriceCategories ? ( localize(7485, "Cost")) : undefined,
             focusFilterOnOpen: true,
             collapsedByDefault: ( new Set([ModelPickerSection.Other])),
             onDidToggleSection: (section, collapsed) => {
@@ -946,6 +1028,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 action.run();
             },
             onHide: () => {
+                hoverDisposables.dispose();
                 this._nameButton?.setAttribute("aria-expanded", "false");
                 if (isHTMLElement(previouslyFocusedElement)) {
                     previouslyFocusedElement.focus();
@@ -994,7 +1077,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         if (statusIcon) {
             nameChildren.push(renderIcon(statusIcon));
         }
-        const modelLabel = name ?? ( localize(7473, "Auto"));
+        const modelLabel = name ?? ( localize(7558, "Auto"));
         const isUBB = !!this._entitlementService.quotas.usageBasedBilling;
         const configDescription = !isUBB && this._selectedModel ? getModelConfigurationDescription(this._selectedModel, this._languageModelsService) : undefined;
         const fullLabel = configDescription ? `${modelLabel} · ${configDescription}` : modelLabel;
@@ -1012,7 +1095,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 $("span.chat-input-picker-label", undefined, effortLabel)
             );
             this._effortButton.style.display = "";
-            this._effortButton.ariaLabel = ( localize(7486, "Thinking Effort: {0}", effortLabel));
+            this._effortButton.ariaLabel = ( localize(7571, "Thinking Effort: {0}", effortLabel));
         } else if (this._effortButton) {
             this._effortButton.style.display = "none";
         }
@@ -1025,11 +1108,11 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 $("span.chat-input-picker-label", undefined, tokensLabel)
             );
             this._tokensButton.style.display = "";
-            this._tokensButton.ariaLabel = ( localize(7487, "Context Size: {0}", tokensLabel));
+            this._tokensButton.ariaLabel = ( localize(7572, "Context Size: {0}", tokensLabel));
         } else if (this._tokensButton) {
             this._tokensButton.style.display = "none";
         }
-        this._domNode.ariaLabel = ( localize(7488, "Pick Model, {0}", fullLabel));
+        this._domNode.ariaLabel = ( localize(7573, "Pick Model, {0}", fullLabel));
     }
     _getConfigProperty(group) {
         if (!this._selectedModel) {
@@ -1050,13 +1133,13 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         const enumItemLabels = config.schema.enumItemLabels;
         const items = [{
             kind: ActionListItemKind.Header,
-            label: ( localize(7489, "Thinking Effort"))
+            label: ( localize(7574, "Thinking Effort"))
         }];
         for (let index = 0; index < enumValues.length; index++) {
             const value = enumValues[index];
             const label = enumItemLabels?.[index] ?? String(value);
             const isDefault = value === config.schema.default;
-            const displayLabel = isDefault ? ( localize(7490, "{0} (default)", label)) : label;
+            const displayLabel = isDefault ? ( localize(7575, "{0} (default)", label)) : label;
             items.push({
                 item: {
                     id: `effort.${value}`,
@@ -1111,7 +1194,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 getWidgetRole: () => "menu"
             },
             {
-                footerText: ( localize(7491, "Higher levels of thinking may increase costs"))
+                footerText: ( localize(7576, "Higher levels of thinking may increase costs"))
             }
         );
     }
@@ -1128,13 +1211,13 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         const enumItemLabels = config.schema.enumItemLabels;
         const items = [{
             kind: ActionListItemKind.Header,
-            label: ( localize(7492, "Context Size"))
+            label: ( localize(7577, "Context Size"))
         }];
         for (let index = 0; index < enumValues.length; index++) {
             const value = enumValues[index];
             const label = enumItemLabels?.[index] ?? formatTokenCount(Number(value));
             const isDefault = value === config.schema.default;
-            const displayLabel = isDefault ? ( localize(7493, "{0} (default)", label)) : label;
+            const displayLabel = isDefault ? ( localize(7578, "{0} (default)", label)) : label;
             const description = config.schema.enumDescriptions?.[index];
             items.push({
                 item: {
@@ -1190,12 +1273,12 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 getWidgetRole: () => "menu"
             },
             {
-                footerText: ( localize(7494, "Larger size may increase cost in longer sessions"))
+                footerText: ( localize(7579, "Larger size may increase cost in longer sessions"))
             }
         );
     }
 };
-ModelPickerWidget = ( __decorate([( __param(1, IActionWidgetService)), ( __param(2, ICommandService)), ( __param(3, IOpenerService)), ( __param(4, ITelemetryService)), ( __param(5, ILanguageModelsService)), ( __param(6, IProductService)), ( __param(7, IChatEntitlementService)), ( __param(8, IUpdateService)), ( __param(9, IUriIdentityService))], ModelPickerWidget));
+ModelPickerWidget = ( __decorate([( __param(1, IActionWidgetService)), ( __param(2, ICommandService)), ( __param(3, IOpenerService)), ( __param(4, ITelemetryService)), ( __param(5, ILanguageModelsService)), ( __param(6, IProductService)), ( __param(7, IChatEntitlementService)), ( __param(8, IUpdateService)), ( __param(9, IUriIdentityService)), ( __param(10, IDefaultAccountService))], ModelPickerWidget));
 function getModelHoverContent(model, openerService, isUBB) {
     const isAuto = isAutoModel(model);
     const container = $(".chat-model-hover");
@@ -1227,25 +1310,31 @@ function getModelHoverContent(model, openerService, isUBB) {
         const costLines = [];
         if (model.metadata.inputCost !== undefined) {
             costLines.push({
-                label: ( localize(7495, "Input")),
-                value: model.metadata.inputCost === 1 ? ( localize(7496, "{0} credit", model.metadata.inputCost)) : ( localize(7497, "{0} credits", model.metadata.inputCost))
+                label: ( localize(7580, "Input")),
+                value: model.metadata.inputCost === 1 ? ( localize(7581, "{0} credit", model.metadata.inputCost)) : ( localize(7582, "{0} credits", model.metadata.inputCost))
             });
         }
         if (model.metadata.cacheCost !== undefined) {
             costLines.push({
-                label: ( localize(7498, "Cached input")),
-                value: model.metadata.cacheCost === 1 ? ( localize(7496, "{0} credit", model.metadata.cacheCost)) : ( localize(7497, "{0} credits", model.metadata.cacheCost))
+                label: ( localize(7583, "Cached input")),
+                value: model.metadata.cacheCost === 1 ? ( localize(7581, "{0} credit", model.metadata.cacheCost)) : ( localize(7582, "{0} credits", model.metadata.cacheCost))
             });
         }
         if (model.metadata.outputCost !== undefined) {
             costLines.push({
-                label: ( localize(7499, "Output")),
-                value: model.metadata.outputCost === 1 ? ( localize(7496, "{0} credit", model.metadata.outputCost)) : ( localize(7497, "{0} credits", model.metadata.outputCost))
+                label: ( localize(7584, "Output")),
+                value: model.metadata.outputCost === 1 ? ( localize(7581, "{0} credit", model.metadata.outputCost)) : ( localize(7582, "{0} credits", model.metadata.outputCost))
             });
         }
+        const priceCategoryLabel = getPriceCategoryLabel(model.metadata.priceCategory);
         if (costLines.length > 0) {
             const costSection = $(".chat-model-hover-cost");
-            costSection.appendChild($(".chat-model-hover-cost-title", undefined, ( localize(7500, "Cost (per 1M tokens)"))));
+            const titleRow = $(".chat-model-hover-cost-title-row");
+            titleRow.appendChild($(".chat-model-hover-cost-title", undefined, ( localize(7585, "Cost (per 1M tokens)"))));
+            if (priceCategoryLabel) {
+                titleRow.appendChild($("span.chat-model-hover-cost-tag", undefined, priceCategoryLabel));
+            }
+            costSection.appendChild(titleRow);
             for (const line of costLines) {
                 costSection.appendChild($(
                     ".chat-model-hover-cost-line",
@@ -1255,16 +1344,23 @@ function getModelHoverContent(model, openerService, isUBB) {
                 ));
             }
             container.appendChild(costSection);
+        } else if (priceCategoryLabel) {
+            const costSection = $(".chat-model-hover-cost");
+            const titleRow = $(".chat-model-hover-cost-title-row");
+            titleRow.appendChild($(".chat-model-hover-cost-title", undefined, ( localize(7586, "Cost"))));
+            titleRow.appendChild($("span.chat-model-hover-cost-tag", undefined, priceCategoryLabel));
+            costSection.appendChild(titleRow);
+            container.appendChild(costSection);
         } else if (model.metadata.pricing && !isMultiplierPricing(model)) {
             const costSection = $(".chat-model-hover-cost");
-            costSection.appendChild($("span", undefined, ( localize(7501, "Cost: {0}", model.metadata.pricing))));
+            costSection.appendChild($("span", undefined, ( localize(7587, "Cost: {0}", model.metadata.pricing))));
             container.appendChild(costSection);
         }
     }
     if (!isAuto && (model.metadata.maxInputTokens || model.metadata.maxOutputTokens)) {
         const totalTokens = (model.metadata.maxInputTokens ?? 0) + (model.metadata.maxOutputTokens ?? 0);
         const contextSection = $(".chat-model-hover-context");
-        contextSection.appendChild($(".chat-model-hover-context-label", undefined, ( localize(7502, "Max context"))));
+        contextSection.appendChild($(".chat-model-hover-context-label", undefined, ( localize(7588, "Max context"))));
         contextSection.appendChild($(
             ".chat-model-hover-context-value",
             undefined,
@@ -1286,7 +1382,7 @@ function getModelHoverContent(model, openerService, isUBB) {
             container.appendChild($(".chat-model-hover-separator"));
             const configRow = $(".chat-model-hover-configurable");
             configRow.appendChild(
-                $("span.chat-model-hover-configurable-label", undefined, ( localize(7503, "Configurable:")))
+                $("span.chat-model-hover-configurable-label", undefined, ( localize(7589, "Configurable:")))
             );
             for (const label of configurableLabels) {
                 configRow.appendChild($("span.chat-model-hover-configurable-tag", undefined, label));