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

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

@@ -25,7 +25,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { TelemetryTrustedValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { MANAGE_CHAT_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+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 { semverExports } from '@codingame/monaco-vscode-api/_virtual/semver';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
@@ -50,26 +50,29 @@ function getUpdateHoverContent(updateState) {
     switch (updateState) {
     case StateType.AvailableForDownload:
         hoverContent.appendMarkdown(( localize(
-            7547,
+            7691,
             "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(
-            7548,
+            7692,
             "This model requires a newer version of VS Code. [Restart to Update](command:update.restartToUpdate) to access it."
         )));
         break;
     default:
         hoverContent.appendMarkdown(( localize(
-            7549,
+            7693,
             "This model requires a newer version of VS Code. [Update VS Code](command:update.checkForUpdate) to access it."
         )));
         break;
     }
     return hoverContent;
 }
+function getControlModelsForEntitlement(manifest, entitlement) {
+    return isProUser(entitlement) && entitlement !== ChatEntitlement.EDU ? manifest.paid : manifest.free;
+}
 const ModelPickerSection = {
     Other: "other"
 };
@@ -148,7 +151,7 @@ function createModelItem(
 function createPinAction(modelIdentifier, isPinned, onTogglePin) {
     return toAction({
         id: `pin.${modelIdentifier}`,
-        label: isPinned ? ( localize(7550, "Unpin Model")) : ( localize(7551, "Pin Model")),
+        label: isPinned ? ( localize(7694, "Unpin Model")) : ( localize(7695, "Pin Model")),
         class: ThemeIcon.asClassName(isPinned ? Codicon.pinned : Codicon.pin),
         run: () => onTogglePin(modelIdentifier, !isPinned)
     });
@@ -177,16 +180,23 @@ function resolveConfigProperty(model, group, languageModelsService) {
 }
 function getPriceCategoryLabel(priceCategory) {
     switch (priceCategory) {
+    case undefined:
+    case "":
+        return undefined;
     case "low":
-        return localize(7552, "Low cost");
+        return localize(7696, "Low cost");
     case "medium":
-        return localize(7553, "Medium cost");
+        return localize(7697, "Medium cost");
     case "high":
-        return localize(7554, "High cost");
+        return localize(7698, "High cost");
     case "very_high":
-        return localize(7555, "Very high cost");
+        return localize(7699, "Very high cost");
     default:
-        return undefined;
+        return localize(
+            7700,
+            "{0} cost",
+            priceCategory.charAt(0).toUpperCase() + priceCategory.slice(1)
+        );
     }
 }
 function getModelConfigurationDescription(model, languageModelsService) {
@@ -249,7 +259,7 @@ function createModelAction(
     };
 }
 function shouldShowManageModelsAction(chatEntitlementService) {
-    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;
+    return chatEntitlementService.clientByokEnabled || 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 {
@@ -257,8 +267,8 @@ function createManageModelsAction(commandService) {
         enabled: true,
         checked: false,
         class: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(7556, "Manage Language Models")),
-        label: ( localize(7557, "Manage Models...")),
+        tooltip: ( localize(7701, "Manage Language Models")),
+        label: ( localize(7702, "Manage Models...")),
         run: () => {
             commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
         }
@@ -291,8 +301,8 @@ function buildModelPickerItems(
             enabled: true,
             checked: true,
             class: undefined,
-            tooltip: ( localize(7558, "Auto")),
-            label: ( localize(7558, "Auto")),
+            tooltip: ( localize(7703, "Auto")),
+            label: ( localize(7703, "Auto")),
             run: () => {}
         }));
     }
@@ -364,7 +374,7 @@ function buildModelPickerItems(
             if (pinnedModels.length > 0) {
                 items.push({
                     kind: ActionListItemKind.Separator,
-                    label: ( localize(7559, "Pinned"))
+                    label: ( localize(7704, "Pinned"))
                 });
                 for (const model of pinnedModels) {
                     const groupLabel = showGroupLabel ? getProviderGroupForModel(model, modelToGroup, languageModelsService).groupName : undefined;
@@ -545,12 +555,12 @@ function buildModelPickerItems(
                         enabled: true,
                         checked: false,
                         class: undefined,
-                        tooltip: ( localize(7560, "Other Models")),
-                        label: ( localize(7560, "Other Models")),
+                        tooltip: ( localize(7705, "Other Models")),
+                        label: ( localize(7705, "Other Models")),
                         run: () => {}
                     },
                     kind: ActionListItemKind.Action,
-                    label: ( localize(7560, "Other Models")),
+                    label: ( localize(7705, "Other Models")),
                     group: {
                         title: "",
                         icon: Codicon.chevronDown
@@ -749,15 +759,15 @@ function createUnavailableModelItem(
 ) {
     let description;
     if (reason === "upgrade") {
-        description = ( new MarkdownString(( localize(7561, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
+        description = ( new MarkdownString(( localize(7706, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
             isTrusted: true
         }));
     } else if (reason === "update") {
-        description = ( localize(7562, "Update VS Code"));
+        description = ( localize(7707, "Update VS Code"));
     } else {
-        description = manageSettingsUrl ? ( new MarkdownString(( localize(7563, "[Contact your admin]({0})", manageSettingsUrl)), {
+        description = manageSettingsUrl ? ( new MarkdownString(( localize(7708, "[Contact your admin]({0})", manageSettingsUrl)), {
             isTrusted: true
-        })) : ( localize(7564, "Contact your admin"));
+        })) : ( localize(7709, "Contact your admin"));
     }
     let hoverContent;
     if (reason === "upgrade") {
@@ -767,12 +777,12 @@ function createUnavailableModelItem(
         }));
         if (chatEntitlementService.entitlement === ChatEntitlement.Pro) {
             hoverContent.appendMarkdown(( localize(
-                7565,
+                7710,
                 "[Upgrade to GitHub Copilot Pro+](command:workbench.action.chat.upgradePlan \" \") to use the best models."
             )));
         } else {
             hoverContent.appendMarkdown(( localize(
-                7566,
+                7711,
                 "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan \" \") to use the best models."
             )));
         }
@@ -784,7 +794,7 @@ function createUnavailableModelItem(
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            7567,
+            7712,
             "This model is not available. Contact your administrator to enable it."
         )));
     }
@@ -859,12 +869,12 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             this._renderLabel();
         }));
     }
-    setHideChevrons(hideChevrons) {
-        this._hideChevrons = hideChevrons;
+    setCompact(compact) {
+        this._compact = compact;
         this._register(autorun(reader => {
-            const hide = hideChevrons.read(reader);
+            const isCompact = compact.read(reader);
             if (this._domNode) {
-                this._domNode.classList.toggle("hide-chevrons", hide);
+                this._domNode.classList.toggle("compact", isCompact);
             }
             this._renderLabel();
         }));
@@ -886,8 +896,8 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
     render(container) {
         this._domNode = append(container, $("div.action-label.model-picker-split"));
         this._domNode.setAttribute("role", "group");
-        if (this._hideChevrons?.get()) {
-            this._domNode.classList.toggle("hide-chevrons", true);
+        if (this._compact?.get()) {
+            this._domNode.classList.toggle("compact", true);
         }
         this._nameButton = append(this._domNode, $("a.model-picker-section.model-picker-name"));
         this._nameButton.tabIndex = 0;
@@ -913,10 +923,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(7568, "Set Thinking Effort")))
+            getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this._effortButton, ( localize(7713, "Set Thinking Effort")))
         );
         this._register(
-            getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this._tokensButton, ( localize(7569, "Set Context Size")))
+            getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this._tokensButton, ( localize(7714, "Set Context Size")))
         );
     }
     _registerButtonAction(element, action) {
@@ -951,10 +961,10 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             this._onDidChangeSelection.fire(model);
         };
         const models = this._delegate.getModels();
-        const isPro = isProUser(this._entitlementService.entitlement);
         const isUBB = !!this._entitlementService.quotas.usageBasedBilling;
+        const isSignedOut = this._entitlementService.entitlement === ChatEntitlement.Unknown;
         const manifest = this._languageModelsService.getModelsControlManifest();
-        const controlModelsForTier = isPro ? manifest.paid : manifest.free;
+        const controlModelsForTier = isSignedOut ? {} : getControlModelsForEntitlement(manifest, this._entitlementService.entitlement);
         const canShowManageModelsAction = this._delegate.showManageModelsAction() && shouldShowManageModelsAction(this._entitlementService);
         const manageModelsAction = canShowManageModelsAction ? createManageModelsAction(this._commandService) : undefined;
         const logModelPickerInteraction = interaction => {
@@ -975,8 +985,8 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         const items = buildModelPickerItems(
             models,
             this._selectedModel?.identifier,
-            this._languageModelsService.getRecentlyUsedModelIds(),
-            this._languageModelsService.getPinnedModelIds(),
+            this._languageModelsService.getRecentlyUsedModelIds().filter(id => !this._languageModelsService.isModelHidden(id)),
+            this._languageModelsService.getPinnedModelIds().filter(id => !this._languageModelsService.isModelHidden(id)),
             controlModelsForTier,
             this._productService.version,
             this._updateService.state.type,
@@ -1000,7 +1010,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         }
         const listOptions = {
             showFilter: true,
-            filterPlaceholder: ( localize(7570, "Search models")),
+            filterPlaceholder: ( localize(7715, "Search models")),
             filterActions: !isUBB && manageModelsAction ? [manageModelsAction] : undefined,
             focusFilterOnOpen: true,
             collapsedByDefault: ( new Set([ModelPickerSection.Other])),
@@ -1077,7 +1087,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         if (statusIcon) {
             nameChildren.push(renderIcon(statusIcon));
         }
-        const modelLabel = name ?? ( localize(7558, "Auto"));
+        const modelLabel = name ?? ( localize(7703, "Auto"));
         const isUBB = !!this._entitlementService.quotas.usageBasedBilling;
         const configDescription = !isUBB && this._selectedModel ? getModelConfigurationDescription(this._selectedModel, this._languageModelsService) : undefined;
         const fullLabel = configDescription ? `${modelLabel} · ${configDescription}` : modelLabel;
@@ -1095,7 +1105,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 $("span.chat-input-picker-label", undefined, effortLabel)
             );
             this._effortButton.style.display = "";
-            this._effortButton.ariaLabel = ( localize(7571, "Thinking Effort: {0}", effortLabel));
+            this._effortButton.ariaLabel = ( localize(7716, "Thinking Effort: {0}", effortLabel));
         } else if (this._effortButton) {
             this._effortButton.style.display = "none";
         }
@@ -1108,11 +1118,11 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 $("span.chat-input-picker-label", undefined, tokensLabel)
             );
             this._tokensButton.style.display = "";
-            this._tokensButton.ariaLabel = ( localize(7572, "Context Size: {0}", tokensLabel));
+            this._tokensButton.ariaLabel = ( localize(7717, "Context Size: {0}", tokensLabel));
         } else if (this._tokensButton) {
             this._tokensButton.style.display = "none";
         }
-        this._domNode.ariaLabel = ( localize(7573, "Pick Model, {0}", fullLabel));
+        this._domNode.ariaLabel = ( localize(7718, "Pick Model, {0}", fullLabel));
     }
     _getConfigProperty(group) {
         if (!this._selectedModel) {
@@ -1129,17 +1139,18 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             return;
         }
         const modelIdentifier = this._selectedModel.identifier;
+        const previousEffortValue = String(config.value ?? "");
         const enumValues = config.schema.enum ?? [];
         const enumItemLabels = config.schema.enumItemLabels;
         const items = [{
             kind: ActionListItemKind.Header,
-            label: ( localize(7574, "Thinking Effort"))
+            label: ( localize(7719, "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(7575, "{0} (default)", label)) : label;
+            const displayLabel = isDefault ? ( localize(7720, "{0} (default)", label)) : label;
             items.push({
                 item: {
                     id: `effort.${value}`,
@@ -1149,6 +1160,11 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                     tooltip: config.schema.enumDescriptions?.[index] ?? "",
                     label: displayLabel,
                     run: () => {
+                        this._telemetryService.publicLog2("chat.thinkingEffortChange", {
+                            model: this._selectedModel?.metadata.vendor === "copilot" ? ( new TelemetryTrustedValue(modelIdentifier)) : "unknown",
+                            fromValue: previousEffortValue,
+                            toValue: String(value)
+                        });
                         this._languageModelsService.setModelConfiguration(modelIdentifier, {
                             [config.key]: value
                         });
@@ -1194,7 +1210,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 getWidgetRole: () => "menu"
             },
             {
-                footerText: ( localize(7576, "Higher levels of thinking may increase costs"))
+                footerText: ( localize(7721, "Higher levels of thinking may increase costs"))
             }
         );
     }
@@ -1207,17 +1223,17 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             return;
         }
         const modelIdentifier = this._selectedModel.identifier;
+        const previousTokensValue = String(config.value ?? "");
         const enumValues = config.schema.enum ?? [];
         const enumItemLabels = config.schema.enumItemLabels;
         const items = [{
             kind: ActionListItemKind.Header,
-            label: ( localize(7577, "Context Size"))
+            label: ( localize(7722, "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(7578, "{0} (default)", label)) : label;
+            const displayLabel = label;
             const description = config.schema.enumDescriptions?.[index];
             items.push({
                 item: {
@@ -1228,6 +1244,11 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                     tooltip: description ?? "",
                     label: displayLabel,
                     run: () => {
+                        this._telemetryService.publicLog2("chat.contextSizeChange", {
+                            model: this._selectedModel?.metadata.vendor === "copilot" ? ( new TelemetryTrustedValue(modelIdentifier)) : "unknown",
+                            fromValue: previousTokensValue,
+                            toValue: String(value)
+                        });
                         this._languageModelsService.setModelConfiguration(modelIdentifier, {
                             [config.key]: value
                         });
@@ -1273,7 +1294,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
                 getWidgetRole: () => "menu"
             },
             {
-                footerText: ( localize(7579, "Larger size may increase cost in longer sessions"))
+                footerText: ( localize(7723, "Larger context may increase cost"))
             }
         );
     }
@@ -1307,60 +1328,82 @@ function getModelHoverContent(model, openerService, isUBB) {
         container.appendChild(descriptionContainer);
     }
     if (!isAuto && isUBB) {
-        const costLines = [];
-        if (model.metadata.inputCost !== undefined) {
-            costLines.push({
-                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(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(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");
+        const formatCostValue = cost => {
+            return cost === 1 ? ( localize(7724, "{0} credit", cost)) : ( localize(7725, "{0} credits", cost));
+        };
+        const buildCostLines = (input, cache, output) => {
+            const lines = [];
+            if (input !== undefined) {
+                lines.push({
+                    label: ( localize(7726, "Input")),
+                    value: formatCostValue(input)
+                });
+            }
+            if (cache !== undefined) {
+                lines.push({
+                    label: ( localize(7727, "Cached input")),
+                    value: formatCostValue(cache)
+                });
+            }
+            if (output !== undefined) {
+                lines.push({
+                    label: ( localize(7728, "Output")),
+                    value: formatCostValue(output)
+                });
+            }
+            return lines;
+        };
+        const appendCostSection = (parent, title, lines, categoryLabel) => {
+            const section = $(".chat-model-hover-cost");
             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));
+            titleRow.appendChild($(".chat-model-hover-cost-title", undefined, title));
+            if (categoryLabel) {
+                titleRow.appendChild($("span.chat-model-hover-cost-tag", undefined, categoryLabel));
             }
-            costSection.appendChild(titleRow);
-            for (const line of costLines) {
-                costSection.appendChild($(
+            section.appendChild(titleRow);
+            for (const line of lines) {
+                section.appendChild($(
                     ".chat-model-hover-cost-line",
                     undefined,
                     $("span.chat-model-hover-cost-line-label", undefined, `${line.label}: `),
                     $("span", undefined, line.value)
                 ));
             }
-            container.appendChild(costSection);
+            parent.appendChild(section);
+        };
+        const costLines = buildCostLines(
+            model.metadata.inputCost,
+            model.metadata.cacheCost,
+            model.metadata.outputCost
+        );
+        const priceCategoryLabel = getPriceCategoryLabel(model.metadata.priceCategory);
+        if (costLines.length > 0) {
+            appendCostSection(container, ( localize(7729, "Cost (per 1M tokens)")), costLines, priceCategoryLabel);
+            const longContextCostLines = buildCostLines(
+                model.metadata.longContextInputCost,
+                model.metadata.longContextCacheCost,
+                model.metadata.longContextOutputCost
+            );
+            if (longContextCostLines.length > 0) {
+                appendCostSection(container, ( localize(7730, "Long context cost (per 1M tokens)")), longContextCostLines);
+            }
         } 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($(".chat-model-hover-cost-title", undefined, ( localize(7731, "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(7587, "Cost: {0}", model.metadata.pricing))));
+            costSection.appendChild($("span", undefined, ( localize(7732, "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(7588, "Max context"))));
+        contextSection.appendChild($(".chat-model-hover-context-label", undefined, ( localize(7733, "Max context"))));
         contextSection.appendChild($(
             ".chat-model-hover-context-value",
             undefined,
@@ -1382,7 +1425,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(7589, "Configurable:")))
+                $("span.chat-model-hover-configurable-label", undefined, ( localize(7734, "Configurable:")))
             );
             for (const label of configurableLabels) {
                 configRow.appendChild($("span.chat-model-hover-configurable-tag", undefined, label));
@@ -1396,9 +1439,12 @@ function getModelHoverContent(model, openerService, isUBB) {
     } : undefined;
 }
 function formatTokenCount(count) {
-    if (count > 900_000) {
-        const value = Math.ceil(count / 1_000_000);
-        return `${value}M`;
+    if (count >= 1_000_000) {
+        const value = count / 1_000_000;
+        const floored = Math.floor(value * 10) / 10;
+        return floored % 1 === 0 ? `${floored.toFixed(0)}M` : `${floored.toFixed(1)}M`;
+    } else if (count > 900_000) {
+        return "1M";
     } else if (count >= 1000) {
         return `${Math.round(count / 1000)}K`;
     }
@@ -1408,4 +1454,4 @@ function isAutoModel(model) {
     return model.metadata.id === "auto" && (model.metadata.vendor === "copilot" || model.metadata.vendor === "copilotcli");
 }
 
-export { ModelPickerWidget, buildModelPickerItems, formatTokenCount, getModelPickerAccessibilityProvider };
+export { ModelPickerWidget, buildModelPickerItems, formatTokenCount, getControlModelsForEntitlement, getModelHoverContent, getModelPickerAccessibilityProvider };

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

@@ -6,7 +6,6 @@ import { append, $, EventType, addDisposableListener, EventHelper, clearNode } f
 import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Gesture, EventType as EventType$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/touch';
 import { BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
-import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -88,17 +87,16 @@ let MobileChatInputCombinedPickerActionItem = class MobileChatInputCombinedPicke
             append(trigger, renderIcon(modeIcon));
         }
         const currentModel = this._modelDelegate.currentModel.get();
-        const labelText = currentModel?.metadata.name ?? ( localize(7590, "Auto"));
+        const labelText = currentModel?.metadata.name ?? ( localize(7735, "Auto"));
         const labelSpan = append(trigger, $("span.chat-input-picker-label"));
         labelSpan.textContent = labelText;
-        append(trigger, renderIcon(Codicon.chevronDown));
         const ariaParts = [];
         const modeLabel = currentMode.label.get();
         if (modeLabel) {
             ariaParts.push(modeLabel);
         }
         ariaParts.push(labelText);
-        trigger.ariaLabel = ( localize(7591, "Pick Mode and Model, {0}", ariaParts.join(", ")));
+        trigger.ariaLabel = ( localize(7736, "Pick Mode and Model, {0}", ariaParts.join(", ")));
     }
     onClick() {}
     async _showSheet() {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.d.ts

@@ -1,12 +1,14 @@
 import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
-import { IActionWidgetDropdownAction } from "../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js";
+import { IActionWidgetDropdownAction } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidgetDropdown";
 import { MenuItemAction } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 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 { 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 { AgentSessionTarget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions";
 import { ISessionTypePickerDelegate } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
@@ -20,7 +22,7 @@ import { IGitService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/co
 export declare class DelegationSessionPickerActionItem extends SessionTypePickerActionItem {
     private readonly gitService;
     private readonly _isSessionsWindow;
-    constructor(action: MenuItemAction, chatSessionPosition: "sidebar" | "editor", delegate: ISessionTypePickerDelegate, pickerOptions: IChatInputPickerOptions, actionWidgetService: IActionWidgetService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatSessionsService: IChatSessionsService, commandService: ICommandService, openerService: IOpenerService, telemetryService: ITelemetryService, gitService: IGitService);
+    constructor(action: MenuItemAction, chatSessionPosition: "sidebar" | "editor", delegate: ISessionTypePickerDelegate, pickerOptions: IChatInputPickerOptions, actionWidgetService: IActionWidgetService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatSessionsService: IChatSessionsService, commandService: ICommandService, openerService: IOpenerService, telemetryService: ITelemetryService, chatEntitlementService: IChatEntitlementService, configurationService: IConfigurationService, gitService: IGitService);
     protected _run(sessionTypeItem: ISessionTypeItem): void;
     protected _getSelectedSessionType(): AgentSessionTarget | undefined;
     protected _isSessionTypeEnabled(type: AgentSessionTarget): boolean;