@codingame/monaco-vscode-chat-service-override 31.0.1 → 32.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.js

@@ -4,7 +4,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import * as chatModelsWidget from './media/chatModelsWidget.css';
 import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { $ as $$1, append, clearNode, getTotalWidth, isMouseEvent, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $ as $$1, append, clearNode, getTotalWidth, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
@@ -16,10 +16,10 @@ import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
-import { Action, Separator, SubmenuAction, toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { Action, Separator, toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { ChatModelGroup, isLanguageModelProviderEntry, isLanguageModelGroupEntry, isStatusEntry, ChatModelsViewModel, SEARCH_SUGGESTIONS } from './chatModelsViewModel.js';
+import { isLanguageModelProviderEntry, isLanguageModelGroupEntry, isStatusEntry, ChatModelsViewModel, SEARCH_SUGGESTIONS } from './chatModelsViewModel.js';
 import { HighlightedLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { SuggestEnabledInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -38,7 +38,7 @@ import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { AnchorAlignment } from '@codingame/monaco-vscode-api/vscode/vs/base/common/layout';
 
-var ModelNameColumnRenderer_1, MultiplierColumnRenderer_1, TokenLimitsColumnRenderer_1, ActionsColumnRenderer_1, ChatModelsWidget_1;
+var ModelNameColumnRenderer_1, CombinedCostColumnRenderer_1, TokenLimitsColumnRenderer_1, ActionsColumnRenderer_1, ChatModelsWidget_1;
 registerCss(chatModelsWidget);
 const $ = $$1;
 const HEADER_HEIGHT = 30;
@@ -46,7 +46,7 @@ const VENDOR_ROW_HEIGHT = 30;
 const MODEL_ROW_HEIGHT = 26;
 class ModelsFilterAction extends Action {
     constructor() {
-        super("workbench.models.filter", ( localize(6164, "Filter")), ThemeIcon.asClassName(Codicon.filter));
+        super("workbench.models.filter", ( localize(6398, "Filter")), ThemeIcon.asClassName(Codicon.filter));
     }
     async run() {}
 }
@@ -90,19 +90,6 @@ let ModelsSearchFilterDropdownMenuActionViewItem = class ModelsSearchFilterDropd
         this.search = search;
         this.viewModel = viewModel;
     }
-    createGroupByAction(grouping, label) {
-        return {
-            id: `groupBy.${grouping}`,
-            label,
-            class: undefined,
-            enabled: true,
-            tooltip: ( localize(6165, "Group by {0}", label)),
-            checked: this.viewModel.groupBy === grouping,
-            run: () => {
-                this.viewModel.groupBy = grouping;
-            }
-        };
-    }
     createProviderAction(vendor, displayName) {
         const query = `@provider:"${displayName}"`;
         const currentQuery = this.search.getValue();
@@ -110,7 +97,7 @@ let ModelsSearchFilterDropdownMenuActionViewItem = class ModelsSearchFilterDropd
         return {
             id: `provider-${vendor}`,
             label: displayName,
-            tooltip: ( localize(6166, "Filter by {0}", displayName)),
+            tooltip: ( localize(6399, "Filter by {0}", displayName)),
             class: undefined,
             enabled: true,
             checked: isChecked,
@@ -127,7 +114,7 @@ let ModelsSearchFilterDropdownMenuActionViewItem = class ModelsSearchFilterDropd
         return {
             id: `capability-${capability}`,
             label,
-            tooltip: ( localize(6167, "Filter by {0}", label)),
+            tooltip: ( localize(6400, "Filter by {0}", label)),
             class: undefined,
             enabled: true,
             checked: isChecked,
@@ -136,23 +123,6 @@ let ModelsSearchFilterDropdownMenuActionViewItem = class ModelsSearchFilterDropd
             })
         };
     }
-    createVisibleAction(visible, label) {
-        const query = `@visible:${visible}`;
-        const currentQuery = this.search.getValue();
-        const isChecked = currentQuery.includes(query);
-        return {
-            id: `visible-${visible}`,
-            label,
-            tooltip: ( localize(6168, "Filter by {0}", label)),
-            class: undefined,
-            enabled: true,
-            checked: isChecked,
-            run: () => this.toggleFilterAndSearch({
-                query,
-                excludes: [`@visible:${!visible}`]
-            })
-        };
-    }
     toggleFilterAndSearch(filter) {
         const currentQuery = this.search.getValue();
         const newQuery = toggleFilter(currentQuery, filter);
@@ -160,10 +130,7 @@ let ModelsSearchFilterDropdownMenuActionViewItem = class ModelsSearchFilterDropd
     }
     getActions() {
         const actions = [];
-        actions.push(this.createCapabilityAction("tools", ( localize(6169, "Tools"))), this.createCapabilityAction("vision", ( localize(6170, "Vision"))), this.createCapabilityAction("agent", ( localize(6171, "Agent Mode"))));
-        actions.push(( new Separator()));
-        actions.push(this.createVisibleAction(true, ( localize(6172, "Visible in Chat Model Picker"))));
-        actions.push(this.createVisibleAction(false, ( localize(6173, "Hidden in Chat Model Picker"))));
+        actions.push(this.createCapabilityAction("tools", ( localize(6401, "Tools"))), this.createCapabilityAction("vision", ( localize(6402, "Vision"))), this.createCapabilityAction("agent", ( localize(6403, "Agent Mode"))));
         const configuredVendors = this.viewModel.getConfiguredVendors();
         if (configuredVendors.length > 1) {
             actions.push(( new Separator()));
@@ -171,11 +138,6 @@ let ModelsSearchFilterDropdownMenuActionViewItem = class ModelsSearchFilterDropd
                 vendor => this.createProviderAction(vendor.vendor.vendor, vendor.group.name)
             )));
         }
-        actions.push(( new Separator()));
-        const groupByActions = [];
-        groupByActions.push(this.createGroupByAction(ChatModelGroup.Vendor, ( localize(6174, "Provider"))));
-        groupByActions.push(this.createGroupByAction(ChatModelGroup.Visibility, ( localize(6175, "Visibility (Chat Model Picker)"))));
-        actions.push(( new SubmenuAction("groupBy", ( localize(6176, "Group By")), groupByActions)));
         return actions;
     }
 };
@@ -198,10 +160,6 @@ class ModelsTableColumnRenderer {
         templateData.container.parentElement.classList.toggle("models-vendor-row", isVendor || isGroup);
         templateData.container.parentElement.classList.toggle("models-model-row", !isVendor && !isGroup);
         templateData.container.parentElement.classList.toggle("models-status-row", isStatus);
-        templateData.container.parentElement.classList.toggle(
-            "model-hidden",
-            !isVendor && !isGroup && !isStatus && !element.model.visible
-        );
         if (isVendor) {
             this.renderVendorElement(element, index, templateData);
         } else if (isGroup) {
@@ -254,7 +212,7 @@ class GutterColumnRenderer extends ModelsTableColumnRenderer {
         if (templateData.listRowElement) {
             templateData.listRowElement.setAttribute("aria-expanded", entry.collapsed ? "false" : "true");
         }
-        const label = entry.collapsed ? ( localize(6177, "Expand")) : ( localize(6178, "Collapse"));
+        const label = entry.collapsed ? ( localize(6404, "Expand")) : ( localize(6405, "Collapse"));
         const toggleCollapseAction = {
             id: "toggleCollapse",
             label,
@@ -268,24 +226,7 @@ class GutterColumnRenderer extends ModelsTableColumnRenderer {
             label: false
         });
     }
-    renderModelElement(entry, index, templateData) {
-        const {
-            model: modelEntry
-        } = entry;
-        const isVisible = modelEntry.visible;
-        const toggleVisibilityAction = toAction({
-            id: "toggleVisibility",
-            label: isVisible ? ( localize(6179, "Hide")) : ( localize(6180, "Show")),
-            class: `model-visibility-toggle ${isVisible ? `${ThemeIcon.asClassName(Codicon.eye)} model-visible` : `${ThemeIcon.asClassName(Codicon.eyeClosed)} model-hidden`}`,
-            tooltip: isVisible ? ( localize(6181, "Hide in the chat model picker")) : ( localize(6182, "Show in the chat model picker")),
-            checked: !isVisible,
-            run: async () => this.viewModel.toggleVisibility(entry)
-        });
-        templateData.actionBar.push(toggleVisibilityAction, {
-            icon: true,
-            label: false
-        });
-    }
+    renderModelElement(entry, index, templateData) {}
 }
 let ModelNameColumnRenderer = class ModelNameColumnRenderer extends ModelsTableColumnRenderer {
     static {
@@ -365,9 +306,6 @@ let ModelNameColumnRenderer = class ModelNameColumnRenderer extends ModelsTableC
             markdown.appendMarkdown(`${entry.model.metadata.tooltip}`);
             markdown.appendText(`\n`);
         }
-        if (!entry.model.visible) {
-            markdown.appendMarkdown(`\n\n${( localize(6183, "This model is hidden in the chat model picker"))}`);
-        }
         templateData.elementDisposables.add(
             this.hoverService.setupDelayedHoverAtMouse(templateData.container, () => ({
                 content: markdown,
@@ -399,56 +337,90 @@ let ModelNameColumnRenderer = class ModelNameColumnRenderer extends ModelsTableC
     }
 };
 ModelNameColumnRenderer = ModelNameColumnRenderer_1 = ( __decorate([( __param(0, IHoverService))], ModelNameColumnRenderer));
-let MultiplierColumnRenderer = class MultiplierColumnRenderer extends ModelsTableColumnRenderer {
+let CombinedCostColumnRenderer = class CombinedCostColumnRenderer extends ModelsTableColumnRenderer {
     static {
-        MultiplierColumnRenderer_1 = this;
+        CombinedCostColumnRenderer_1 = this;
     }
     static {
-        this.TEMPLATE_ID = "multiplier";
+        this.TEMPLATE_ID = "combinedCost";
     }
     constructor(hoverService) {
         super();
         this.hoverService = hoverService;
-        this.templateId = MultiplierColumnRenderer_1.TEMPLATE_ID;
+        this.templateId = CombinedCostColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
         const disposables = ( new DisposableStore());
         const elementDisposables = ( new DisposableStore());
-        const multiplierElement = append(container, $(".model-multiplier"));
+        const grid = append(container, $(".model-cost-grid"));
+        const inputCell = append(grid, $("span.model-cost-cell"));
+        const outputCell = append(grid, $("span.model-cost-cell"));
+        const cacheCell = append(grid, $("span.model-cost-cell"));
         return {
             container,
-            multiplierElement,
+            inputCell,
+            outputCell,
+            cacheCell,
             disposables,
             elementDisposables
         };
     }
     renderElement(entry, index, templateData) {
-        templateData.multiplierElement.textContent = "";
+        templateData.inputCell.textContent = "";
+        templateData.outputCell.textContent = "";
+        templateData.cacheCell.textContent = "";
         super.renderElement(entry, index, templateData);
     }
-    renderGroupElement(element, index, templateData) {}
-    renderVendorElement(element, index, templateData) {}
+    renderGroupElement(_element, _index, _templateData) {}
+    renderVendorElement(_element, _index, _templateData) {}
     renderModelElement(entry, index, templateData) {
-        const multiplierText = entry.model.metadata.multiplier ?? "-";
-        templateData.multiplierElement.textContent = multiplierText;
-        if (multiplierText !== "-") {
+        const {
+            inputCost,
+            outputCost,
+            cacheCost
+        } = entry.model.metadata;
+        const hasCost = inputCost !== undefined || outputCost !== undefined || cacheCost !== undefined;
+        if (hasCost) {
+            templateData.inputCell.textContent = inputCost !== undefined ? ( localize(6406, "In: {0}", inputCost)) : "";
+            templateData.outputCell.textContent = outputCost !== undefined ? ( localize(6407, "Out: {0}", outputCost)) : "";
+            templateData.cacheCell.textContent = cacheCost !== undefined ? ( localize(6408, "Cache: {0}", cacheCost)) : "";
+            const parts = [];
+            if (inputCost !== undefined) {
+                parts.push(inputCost === 1 ? ( localize(6409, "Input: {0} credit per 1M tokens", inputCost)) : ( localize(6410, "Input: {0} credits per 1M tokens", inputCost)));
+            }
+            if (outputCost !== undefined) {
+                parts.push(outputCost === 1 ? ( localize(6411, "Output: {0} credit per 1M tokens", outputCost)) : ( localize(6412, "Output: {0} credits per 1M tokens", outputCost)));
+            }
+            if (cacheCost !== undefined) {
+                parts.push(cacheCost === 1 ? ( localize(6413, "Cache: {0} credit per 1M tokens", cacheCost)) : ( localize(6414, "Cache: {0} credits per 1M tokens", cacheCost)));
+            }
             templateData.elementDisposables.add(
                 this.hoverService.setupDelayedHoverAtMouse(templateData.container, () => ({
-                    content: ( localize(
-                        6184,
-                        "Every chat message counts {0} towards your premium model request quota",
-                        multiplierText
-                    )),
+                    content: parts.join("\n"),
                     appearance: {
                         compact: true,
                         skipFadeInAnimation: true
                     }
                 }))
             );
+        } else {
+            const pricingText = entry.model.metadata.pricing;
+            if (pricingText) {
+                templateData.inputCell.textContent = pricingText;
+                templateData.elementDisposables.add(
+                    this.hoverService.setupDelayedHoverAtMouse(templateData.container, () => ({
+                        content: ( localize(6415, "Pricing: {0}", pricingText)),
+                        appearance: {
+                            compact: true,
+                            skipFadeInAnimation: true
+                        }
+                    }))
+                );
+            }
         }
     }
 };
-MultiplierColumnRenderer = MultiplierColumnRenderer_1 = ( __decorate([( __param(0, IHoverService))], MultiplierColumnRenderer));
+CombinedCostColumnRenderer = CombinedCostColumnRenderer_1 = ( __decorate([( __param(0, IHoverService))], CombinedCostColumnRenderer));
 let TokenLimitsColumnRenderer = class TokenLimitsColumnRenderer extends ModelsTableColumnRenderer {
     static {
         TokenLimitsColumnRenderer_1 = this;
@@ -491,7 +463,7 @@ let TokenLimitsColumnRenderer = class TokenLimitsColumnRenderer extends ModelsTa
             const tokenDiv = append(templateData.tokenLimitsElement, $(".token-limit-item"));
             const tokenText = append(tokenDiv, $("span"));
             tokenText.textContent = formatTokenCount(totalTokens);
-            markdown.appendMarkdown(`${( localize(6185, "Context Size"))}: `);
+            markdown.appendMarkdown(`${( localize(6416, "Context Size"))}: `);
             markdown.appendMarkdown(`${formatTokenCount(totalTokens)}`);
         }
         templateData.elementDisposables.add(
@@ -546,7 +518,7 @@ class CapabilitiesColumnRenderer extends ModelsTableColumnRenderer {
             templateData.elementDisposables.add(this.createCapabilityButton(
                 templateData.metadataRow,
                 capabilityMatches?.includes("toolCalling") || false,
-                ( localize(6186, "Tools")),
+                ( localize(6417, "Tools")),
                 "tools"
             ));
         }
@@ -554,7 +526,7 @@ class CapabilitiesColumnRenderer extends ModelsTableColumnRenderer {
             templateData.elementDisposables.add(this.createCapabilityButton(
                 templateData.metadataRow,
                 capabilityMatches?.includes("vision") || false,
-                ( localize(6187, "Vision")),
+                ( localize(6418, "Vision")),
                 "vision"
             ));
         }
@@ -629,17 +601,17 @@ let ActionsColumnRenderer = class ActionsColumnRenderer extends ModelsTableColum
         if (vendorEntry.vendor.configuration) {
             secondaryActions.push(toAction({
                 id: "configureAction",
-                label: ( localize(6188, "Configure...")),
+                label: ( localize(6419, "Configure...")),
                 run: () => this.languageModelsService.configureLanguageModelsProviderGroup(vendorEntry.vendor.vendor, vendorEntry.group.name)
             }));
             secondaryActions.push(toAction({
                 id: "deleteAction",
-                label: ( localize(6189, "Delete")),
+                label: ( localize(6420, "Delete")),
                 class: ThemeIcon.asClassName(Codicon.trash),
                 run: async () => {
                     const result = await this.dialogService.confirm({
                         type: "info",
-                        message: ( localize(6190, "Would you like to delete {0}?", vendorEntry.group.name))
+                        message: ( localize(6421, "Would you like to delete {0}?", vendorEntry.group.name))
                     });
                     if (!result.confirmed) {
                         return;
@@ -651,7 +623,7 @@ let ActionsColumnRenderer = class ActionsColumnRenderer extends ModelsTableColum
         } else if (vendorEntry.vendor.managementCommand) {
             primaryActions.push(toAction({
                 id: "manageVendor",
-                label: ( localize(6191, "Manage {0}...", vendorEntry.group.name)),
+                label: ( localize(6422, "Manage {0}...", vendorEntry.group.name)),
                 class: ThemeIcon.asClassName(Codicon.gear),
                 run: async () => {
                     await this.commandService.executeCommand(vendorEntry.vendor.managementCommand, vendorEntry.vendor.vendor);
@@ -670,7 +642,7 @@ let ActionsColumnRenderer = class ActionsColumnRenderer extends ModelsTableColum
         const secondaryActions = [...configActions];
         secondaryActions.push(toAction({
             id: "configureModel",
-            label: ( localize(6192, "Configure...")),
+            label: ( localize(6423, "Configure...")),
             run: () => this.languageModelsService.configureModel(entry.model.identifier)
         }));
         templateData.actionBar.setActions([], secondaryActions);
@@ -754,18 +726,14 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
     }
     create(container) {
         const searchAndButtonContainer = append(container, $(".models-search-and-button-container"));
-        const placeholder = ( localize(6193, "Type to search..."));
+        const placeholder = ( localize(6424, "Type to search..."));
         const searchContainer = append(searchAndButtonContainer, $(".models-search-container"));
         this.searchWidget = this._register(
             this.instantiationService.createInstance(SuggestEnabledInput, "chatModelsWidget.searchbox", searchContainer, {
                 triggerCharacters: ["@", ":"],
                 provideResults: query => {
                     const providerSuggestions = ( this.viewModel.getVendors().map(v => `@provider:"${v.displayName}"`));
-                    const allSuggestions = [
-                        ...providerSuggestions,
-                        ...SEARCH_SUGGESTIONS.CAPABILITIES,
-                        ...SEARCH_SUGGESTIONS.VISIBILITY
-                    ];
+                    const allSuggestions = [...providerSuggestions, ...SEARCH_SUGGESTIONS.CAPABILITIES];
                     if (!query.trim()) {
                         return allSuggestions;
                     }
@@ -775,8 +743,6 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
                         return providerSuggestions;
                     } else if (lastPart.startsWith("@capability:")) {
                         return SEARCH_SUGGESTIONS.CAPABILITIES;
-                    } else if (lastPart.startsWith("@visible:")) {
-                        return SEARCH_SUGGESTIONS.VISIBILITY;
                     } else if (lastPart.startsWith("@")) {
                         return allSuggestions;
                     }
@@ -791,8 +757,8 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
             })
         );
         const filterAction = this._register(( new ModelsFilterAction()));
-        const clearSearchAction = this._register(( new Action("workbench.models.clearSearch", ( localize(6194, "Clear Search")), ThemeIcon.asClassName(preferencesClearInputIcon), false, () => this.clearSearch())));
-        const collapseAllAction = this._register(( new Action("workbench.models.collapseAll", ( localize(6195, "Collapse All")), ThemeIcon.asClassName(Codicon.collapseAll), false, () => {
+        const clearSearchAction = this._register(( new Action("workbench.models.clearSearch", ( localize(6425, "Clear Search")), ThemeIcon.asClassName(preferencesClearInputIcon), false, () => this.clearSearch())));
+        const collapseAllAction = this._register(( new Action("workbench.models.collapseAll", ( localize(6426, "Collapse All")), ThemeIcon.asClassName(Codicon.collapseAll), false, () => {
             this.viewModel.collapseAll();
         })));
         collapseAllAction.enabled = ( this.viewModel.viewModelEntries.some(e => isLanguageModelGroupEntry(e) || isLanguageModelProviderEntry(e)));
@@ -825,7 +791,7 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
             supportIcons: true
         };
         this.addButton = this._register(( new Button(this.addButtonContainer, buttonOptions)));
-        this.addButton.label = `$(${Codicon.add.id}) ${( localize(6196, "Add Models..."))}`;
+        this.addButton.label = `$(${Codicon.add.id}) ${( localize(6427, "Add Models..."))}`;
         this.addButton.element.classList.add("models-add-model-button");
         this.updateAddModelsButton();
         this._register(this.addButton.onDidClick(e => {
@@ -839,9 +805,10 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
         this.tableContainer = append(container, $(".models-table-container"));
         this.createTable();
         this._register(this.viewModel.onDidChangeGrouping(() => this.createTable()));
-        this._register(
-            this.chatEntitlementService.onDidChangeEntitlement(() => this.updateAddModelsButton())
-        );
+        this._register(this.chatEntitlementService.onDidChangeEntitlement(() => {
+            this.updateAddModelsButton();
+            this.createTable();
+        }));
         this._register(
             this.languageModelsService.onDidChangeLanguageModelVendors(() => this.updateAddModelsButton())
         );
@@ -856,7 +823,7 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
         clearNode(this.tableContainer);
         const gutterColumnRenderer = this.instantiationService.createInstance(GutterColumnRenderer, this.viewModel);
         const modelNameColumnRenderer = this.instantiationService.createInstance(ModelNameColumnRenderer);
-        const costColumnRenderer = this.instantiationService.createInstance(MultiplierColumnRenderer);
+        const combinedCostColumnRenderer = this.instantiationService.createInstance(CombinedCostColumnRenderer);
         const tokenLimitsColumnRenderer = this.instantiationService.createInstance(TokenLimitsColumnRenderer);
         const capabilitiesColumnRenderer = this.instantiationService.createInstance(CapabilitiesColumnRenderer);
         const actionsColumnRenderer = this.instantiationService.createInstance(ActionsColumnRenderer, this.viewModel);
@@ -881,7 +848,7 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
                 return row;
             }
         }, {
-            label: ( localize(6197, "Name")),
+            label: ( localize(6428, "Name")),
             tooltip: "",
             weight: 0.35,
             minimumWidth: 200,
@@ -890,20 +857,11 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
                 return row;
             }
         }];
-        if (this.viewModel.groupBy === ChatModelGroup.Visibility) {
-            columns.push({
-                label: ( localize(6198, "Provider")),
-                tooltip: "",
-                weight: 0.15,
-                minimumWidth: 100,
-                templateId: ProviderColumnRenderer.TEMPLATE_ID,
-                project(row) {
-                    return row;
-                }
-            });
-        }
+        const hasAnyCostFields = ( this.viewModel.viewModelEntries.some(
+            e => !isLanguageModelProviderEntry(e) && !isLanguageModelGroupEntry(e) && !isStatusEntry(e) && (e.model.metadata.inputCost !== undefined || e.model.metadata.outputCost !== undefined || e.model.metadata.cacheCost !== undefined)
+        ));
         columns.push({
-            label: ( localize(6199, "Context Size")),
+            label: ( localize(6429, "Context Size")),
             tooltip: "",
             weight: 0.1,
             minimumWidth: 140,
@@ -912,20 +870,20 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
                 return row;
             }
         }, {
-            label: ( localize(6200, "Capabilities")),
+            label: ( localize(6430, "Capabilities")),
             tooltip: "",
-            weight: 0.2,
+            weight: 0.15,
             minimumWidth: 180,
             templateId: CapabilitiesColumnRenderer.TEMPLATE_ID,
             project(row) {
                 return row;
             }
         }, {
-            label: ( localize(6201, "Request Multiplier")),
+            label: hasAnyCostFields ? ( localize(6431, "Cost (Credits per 1M Tokens)")) : ( localize(6432, "Pricing")),
             tooltip: "",
-            weight: 0.1,
-            minimumWidth: 60,
-            templateId: MultiplierColumnRenderer.TEMPLATE_ID,
+            weight: hasAnyCostFields ? 0.24 : 0.15,
+            minimumWidth: hasAnyCostFields ? 240 : 200,
+            templateId: CombinedCostColumnRenderer.TEMPLATE_ID,
             project(row) {
                 return row;
             }
@@ -944,7 +902,7 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
             this.instantiationService.createInstance(WorkbenchTable, "ModelsWidget", this.tableContainer, ( new Delegate()), columns, [
                 gutterColumnRenderer,
                 modelNameColumnRenderer,
-                costColumnRenderer,
+                combinedCostColumnRenderer,
                 tokenLimitsColumnRenderer,
                 capabilitiesColumnRenderer,
                 actionsColumnRenderer,
@@ -957,46 +915,50 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
                 accessibilityProvider: {
                     getAriaLabel: e => {
                         if (isLanguageModelProviderEntry(e)) {
-                            return localize(6202, "{0} Models", e.vendorEntry.group.name);
+                            return localize(6433, "{0} Models", e.vendorEntry.group.name);
                         } else if (isLanguageModelGroupEntry(e)) {
-                            return e.id === "visible" ? ( localize(6203, "Visible Models")) : ( localize(6204, "Hidden Models"));
+                            return e.id === "visible" ? ( localize(6434, "Visible Models")) : ( localize(6435, "Hidden Models"));
                         } else if (isStatusEntry(e)) {
-                            return localize(6205, "Status: {0}", e.message);
+                            return localize(6436, "Status: {0}", e.message);
                         }
                         const ariaLabels = [];
                         ariaLabels.push(( localize(
-                            6206,
+                            6437,
                             "{0} from {1}",
                             e.model.metadata.name,
                             e.model.provider.vendor.displayName
                         )));
                         if (e.model.metadata.maxInputTokens || e.model.metadata.maxOutputTokens) {
                             const totalTokens = (e.model.metadata.maxInputTokens ?? 0) + (e.model.metadata.maxOutputTokens ?? 0);
-                            ariaLabels.push(( localize(6207, "Context size: {0} tokens", formatTokenCount(totalTokens))));
+                            ariaLabels.push(( localize(6438, "Context size: {0} tokens", formatTokenCount(totalTokens))));
                         }
                         if (e.model.metadata.capabilities) {
                             ariaLabels.push(( localize(
-                                6208,
+                                6439,
                                 "Capabilities: {0}",
                                 ( Object.keys(e.model.metadata.capabilities)).join(", ")
                             )));
                         }
-                        const multiplierText = e.model.metadata.multiplier ?? "-";
-                        if (multiplierText !== "-") {
-                            ariaLabels.push(( localize(
-                                6184,
-                                "Every chat message counts {0} towards your premium model request quota",
-                                multiplierText
+                        const pricingText = e.model.metadata.pricing ?? "-";
+                        if (pricingText !== "-") {
+                            ariaLabels.push(( localize(6440, "Pricing: {0}", pricingText)));
+                        }
+                        if (e.model.metadata.inputCost !== undefined) {
+                            ariaLabels.push(e.model.metadata.inputCost === 1 ? ( localize(6441, "Input cost: {0} credit per 1M tokens", e.model.metadata.inputCost)) : ( localize(6442, "Input cost: {0} credits per 1M tokens", e.model.metadata.inputCost)));
+                        }
+                        if (e.model.metadata.outputCost !== undefined) {
+                            ariaLabels.push(e.model.metadata.outputCost === 1 ? ( localize(6443, "Output cost: {0} credit per 1M tokens", e.model.metadata.outputCost)) : ( localize(
+                                6444,
+                                "Output cost: {0} credits per 1M tokens",
+                                e.model.metadata.outputCost
                             )));
                         }
-                        if (e.model.visible) {
-                            ariaLabels.push(( localize(6209, "This model is visible in the chat model picker")));
-                        } else {
-                            ariaLabels.push(( localize(6210, "This model is hidden in the chat model picker")));
+                        if (e.model.metadata.cacheCost !== undefined) {
+                            ariaLabels.push(e.model.metadata.cacheCost === 1 ? ( localize(6445, "Cache cost: {0} credit per 1M tokens", e.model.metadata.cacheCost)) : ( localize(6446, "Cache cost: {0} credits per 1M tokens", e.model.metadata.cacheCost)));
                         }
                         return ariaLabels.join(". ");
                     },
-                    getWidgetAriaLabel: () => ( localize(6211, "Language Models"))
+                    getWidgetAriaLabel: () => ( localize(6447, "Language Models"))
                 },
                 multipleSelectionSupport: true,
                 setRowLineHeight: false,
@@ -1017,20 +979,6 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
             let configureGroup;
             let configureVendor;
             if (selectedModelEntries.length) {
-                const visibleModels = selectedModelEntries.filter(entry => entry.model.visible);
-                const hiddenModels = selectedModelEntries.filter(entry => !entry.model.visible);
-                actions.push(toAction({
-                    id: "hideSelectedModels",
-                    label: ( localize(6212, "Hide in the Chat Model Picker")),
-                    enabled: visibleModels.length > 0,
-                    run: () => this.viewModel.setModelsVisibility(selectedModelEntries, false)
-                }));
-                actions.push(toAction({
-                    id: "showSelectedModels",
-                    label: ( localize(6213, "Show in the Chat Model Picker")),
-                    enabled: hiddenModels.length > 0,
-                    run: () => this.viewModel.setModelsVisibility(selectedModelEntries, true)
-                }));
                 if (selectedModelEntries.length === 1) {
                     const configActions = this.languageModelsService.getModelConfigurationActions(selectedModelEntries[0].model.identifier);
                     if (configActions.length) {
@@ -1049,18 +997,6 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
             } else if (selectedEntries.length === 1) {
                 const entry = e.element;
                 if (isLanguageModelProviderEntry(entry)) {
-                    if (!entry.vendorEntry.vendor.isDefault) {
-                        actions.push(toAction({
-                            id: "hideAllModels",
-                            label: ( localize(6214, "Hide in the Chat Model Picker")),
-                            run: () => this.viewModel.setGroupVisibility(entry, false)
-                        }));
-                        actions.push(toAction({
-                            id: "showAllModels",
-                            label: ( localize(6215, "Show in the Chat Model Picker")),
-                            run: () => this.viewModel.setGroupVisibility(entry, true)
-                        }));
-                    }
                     configureGroup = entry.vendorEntry.group.name;
                     configureVendor = entry.vendorEntry.vendor;
                 }
@@ -1073,7 +1009,7 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
                     if (configureVendor.managementCommand) {
                         actions.push(toAction({
                             id: "configureVendor",
-                            label: ( localize(6216, "Configure")),
+                            label: ( localize(6448, "Configure")),
                             run: async () => {
                                 await this.commandService.executeCommand(configureVendor.managementCommand, configureVendor.vendor);
                                 await this.viewModel.refresh();
@@ -1082,7 +1018,7 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
                     } else {
                         actions.push(toAction({
                             id: "configureVendor",
-                            label: ( localize(6216, "Configure")),
+                            label: ( localize(6448, "Configure")),
                             run: () => this.languageModelsService.configureLanguageModelsProviderGroup(configureVendor.vendor, configureGroup)
                         }));
                     }
@@ -1126,8 +1062,6 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
             }
             if (isLanguageModelProviderEntry(element) || isLanguageModelGroupEntry(element)) {
                 this.viewModel.toggleCollapsed(element);
-            } else if (!isMouseEvent(browserEvent) || browserEvent.detail === 2) {
-                this.viewModel.toggleVisibility(element);
             }
         }));
         this.tableDisposables.add(
@@ -1146,7 +1080,7 @@ let ChatModelsWidget = class ChatModelsWidget extends Disposable {
         const isManagedEntitlement = entitlement === ChatEntitlement.Business || entitlement === ChatEntitlement.Enterprise;
         const supportsAddingModels = this.chatEntitlementService.isInternal || (isManagedEntitlement && this.chatEntitlementService.clientByokEnabled) || (entitlement !== ChatEntitlement.Unknown && entitlement !== ChatEntitlement.Available && !isManagedEntitlement);
         this.addButton.enabled = supportsAddingModels && configurableVendors.length > 0;
-        this.addButton.setTitle(!supportsAddingModels && isManagedEntitlement ? ( localize(6217, "Adding models is managed by your organization")) : "");
+        this.addButton.setTitle(!supportsAddingModels && isManagedEntitlement ? ( localize(6449, "Adding models is managed by your organization")) : "");
         this.dropdownActions = ( configurableVendors.map(vendor => toAction({
             id: `enable-${vendor.vendor}`,
             label: vendor.displayName,