@codingame/monaco-vscode-api 37.6.0 → 38.0.0

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

@@ -1,6 +1,5 @@
 
 import { renderAsPlaintext } from '../../../../../../../base/browser/markdownRenderer.js';
-import { toAction } from '../../../../../../../base/common/actions.js';
 import { Codicon } from '../../../../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
 import { stripIcons } from '../../../../../../../base/common/iconLabels.js';
@@ -14,13 +13,16 @@ import { StateType } from '../../../../../../../platform/update/common/update.js
 import { ChatEntitlement } from '../../../../../../services/chat/common/chatEntitlementService.js';
 import { getLanguageModelProviderDisplayName, ILanguageModelChatMetadata } from '../../../../common/languageModels.js';
 import { languageModelSourcePresentationRegistry } from '../../../../common/languageModelSourcePresentation.js';
-import { getModelHoverContent } from './modelPickerHover.js';
 import { isMultiplierPricing, getPriceCategoryLabel, isAutoModel } from './modelPickerPresentation.js';
 
 function isVersionAtLeast(current, required) {
     const currentSemver = semverExports.coerce(current);
     return !!currentSemver && semverExports.gte(currentSemver, required);
 }
+function requiresNewerVSCode(model, controlModels, currentVSCodeVersion) {
+    const entry = controlModels[model.metadata.id] ?? controlModels[model.identifier];
+    return !!entry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion);
+}
 function getUpdateHoverContent(updateState) {
     const hoverContent = ( new MarkdownString("", {
         isTrusted: true,
@@ -29,20 +31,20 @@ function getUpdateHoverContent(updateState) {
     switch (updateState) {
     case StateType.AvailableForDownload:
         hoverContent.appendMarkdown(( localize(
-            12207,
+            14545,
             "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(
-            12208,
+            14546,
             "This model requires a newer version of VS Code. [Restart to Update](command:update.restartToUpdate) to access it."
         )));
         break;
     default:
         hoverContent.appendMarkdown(( localize(
-            12209,
+            14547,
             "This model requires a newer version of VS Code. [Update VS Code](command:update.checkForUpdate) to access it."
         )));
         break;
@@ -81,59 +83,12 @@ function getProviderGroupForModel(model, modelToGroup, languageModelsService) {
         groupName: getLanguageModelProviderDisplayName(languageModelsService, model.metadata.vendor)
     };
 }
-function createModelItem(
-    action,
-    model,
-    openerService,
-    vendorLabel,
-    isUBB,
-    ariaDescription,
-    pinAction,
-    onConfigure
-) {
-    const hover = model && openerService ? getModelHoverContent(
-        model,
-        isUBB,
-        onConfigure ? group => onConfigure(model, group) : undefined,
-        openerService
-    ) : undefined;
-    return {
-        item: action,
-        kind: ActionListItemKind.Action,
-        label: action.label,
-        description: action.description,
-        ariaDescription,
-        group: {
-            title: "",
-            icon: action.icon ?? ThemeIcon.fromId(action.checked ? Codicon.check.id : Codicon.blank.id)
-        },
-        hideIcon: false,
-        section: action.section,
-        className: vendorLabel ? "chat-model-picker-inline-source" : undefined,
-        badge: vendorLabel,
-        hover: hover ? {
-            content: hover.element,
-            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(12210, "Unpin Model")) : ( localize(12211, "Pin Model")),
-        class: ThemeIcon.asClassName(isPinned ? Codicon.pinned : Codicon.pin),
-        run: () => onTogglePin(modelIdentifier, !isPinned)
-    });
-}
 function createModelAction(model, selectedModelId, onSelect, section, suppressVendorInDetail) {
     const pricingForDescription = isMultiplierPricing(model) ? model.metadata.pricing : undefined;
     const priceCategoryLabel = getPriceCategoryLabel(model.metadata.priceCategory);
-    const detail = suppressVendorInDetail ? undefined : model.metadata.detail;
+    const detail = undefined ;
     const promo = ILanguageModelChatMetadata.hasPromoDiscount(model.metadata) ? model.metadata.promo : undefined;
-    const promoDetail = promo ? ( localize(12212, "{0}% discount", promo.discountPercent)) : undefined;
+    const promoDetail = promo ? ( localize(14548, "{0}% discount", promo.discountPercent)) : undefined;
     const textParts = [detail, promoDetail, pricingForDescription].filter(Boolean);
     const textDescription = textParts.length > 0 ? textParts.join(" · ") : undefined;
     const action = {
@@ -176,20 +131,19 @@ function createUnavailableModelItem(
     reason,
     manageSettingsUrl,
     updateStateType,
-    chatEntitlementService,
-    section
+    chatEntitlementService
 ) {
     let description;
     if (reason === "upgrade") {
-        description = ( new MarkdownString(( localize(12213, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
+        description = ( new MarkdownString(( localize(14549, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
             isTrusted: true
         }));
     } else if (reason === "update") {
-        description = ( localize(12214, "Update VS Code"));
+        description = ( localize(14550, "Update VS Code"));
     } else {
-        description = manageSettingsUrl ? ( new MarkdownString(( localize(12215, "[Contact your admin]({0})", manageSettingsUrl)), {
+        description = manageSettingsUrl ? ( new MarkdownString(( localize(14551, "[Contact your admin]({0})", manageSettingsUrl)), {
             isTrusted: true
-        })) : ( localize(12216, "Contact your admin"));
+        })) : ( localize(14552, "Contact your admin"));
     }
     let hoverContent;
     if (reason === "upgrade") {
@@ -199,12 +153,12 @@ function createUnavailableModelItem(
         }));
         if (chatEntitlementService.entitlement === ChatEntitlement.Pro) {
             hoverContent.appendMarkdown(( localize(
-                12217,
+                14553,
                 "[Upgrade to GitHub Copilot Pro+](command:workbench.action.chat.upgradePlan \" \") to use the best models."
             )));
         } else {
             hoverContent.appendMarkdown(( localize(
-                12218,
+                14554,
                 "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan \" \") to use the best models."
             )));
         }
@@ -216,7 +170,7 @@ function createUnavailableModelItem(
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            12219,
+            14555,
             "This model is not available. Contact your administrator to enable it."
         )));
     }
@@ -241,11 +195,10 @@ function createUnavailableModelItem(
         disabled: true,
         hideIcon: false,
         className: typeof description === "string" ? "chat-model-picker-unavailable" : "chat-model-picker-unavailable has-link",
-        section,
         hover: {
             content: hoverContent
         }
     };
 }
 
-export { buildModelToProviderGroupMap, createModelAction, createModelItem, createPinAction, createUnavailableModelItem, getProviderGroupForModel, getProviderGroupKey, getUnavailableReason, isVersionAtLeast };
+export { buildModelToProviderGroupMap, createModelAction, createUnavailableModelItem, getProviderGroupForModel, getProviderGroupKey, getUnavailableReason, isVersionAtLeast, requiresNewerVSCode };

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

@@ -5,18 +5,13 @@ import { ICommandService } from "../../../../../../../platform/commands/common/c
 import { ChatEntitlement } from "../../../../../../services/chat/common/chatEntitlementService.js";
 import { IChatEntitlementService } from "../../../../../../services/chat/common/chatEntitlementService.service.js";
 import { IModelControlEntry, ILanguageModelChatMetadataAndIdentifier, IModelsControlManifest } from "../../../../common/languageModels.js";
-import type { IBuildModelPickerItemsOptions } from "./modelPickerItemTypes.js";
-export type { IBuildModelPickerItemsOptions } from "./modelPickerItemTypes.js";
-export { ModelPickerSection } from "./modelPickerItemSections.js";
 export declare function getControlModelsForEntitlement(manifest: IModelsControlManifest, entitlement: ChatEntitlement): IStringDictionary<IModelControlEntry>;
 export declare function getModelPickerControlModels(manifest: IModelsControlManifest, entitlement: ChatEntitlement, models: readonly ILanguageModelChatMetadataAndIdentifier[]): IStringDictionary<IModelControlEntry>;
 export declare function shouldShowManageModelsAction(chatEntitlementService: IChatEntitlementService): boolean;
-export declare function createManageModelsAction(commandService: ICommandService): IActionWidgetDropdownAction;
-/** Builds the ordered model picker sections for the current presentation state. */
-export declare function buildModelPickerItems(options: IBuildModelPickerItemsOptions): IActionListItem<IActionWidgetDropdownAction>[];
-export declare function getModelPickerAccessibilityProvider(isSearch?: boolean): {
+export declare function createManageModelsAction(commandService: ICommandService, sessionType?: string): IActionWidgetDropdownAction;
+export declare function getModelPickerAccessibilityProvider(isSearch?: boolean, multiple?: boolean): {
     readonly getAriaLabel: (element: IActionListItem<IActionWidgetDropdownAction>) => string | null;
     readonly isChecked: (element: IActionListItem<IActionWidgetDropdownAction>) => boolean | undefined;
-    readonly getRole: (element: IActionListItem<IActionWidgetDropdownAction>) => "menuitem" | "menuitemradio" | "option" | "separator";
+    readonly getRole: (element: IActionListItem<IActionWidgetDropdownAction>) => "menuitem" | "menuitemcheckbox" | "menuitemradio" | "option" | "separator";
     readonly getWidgetRole: () => "listbox" | "menu";
 };

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

@@ -5,10 +5,7 @@ import { localize } from '../../../../../../../nls.js';
 import { ActionListItemKind } from '../../../../../../../platform/actionWidget/browser/actionList.js';
 import { isProUser, ChatEntitlement } from '../../../../../../services/chat/common/chatEntitlementService.js';
 import { MANAGE_CHAT_COMMAND_ID } from '../../../../common/constants.js';
-import { RESTRICTED_MODE_TRUST_ACTION_ID, SETUP_REQUIRED_SIGN_IN_ACTION_ID, buildUnavailableStateItems, buildGroupedModelItems, buildFlatModelItems } from './modelPickerItemSections.js';
-export { ModelPickerSection } from './modelPickerItemSections.js';
 
-const PICKER_COMMAND_ACTION_IDS = ( new Set([RESTRICTED_MODE_TRUST_ACTION_ID, SETUP_REQUIRED_SIGN_IN_ACTION_ID]));
 function getControlModelsForEntitlement(manifest, entitlement) {
     return isProUser(entitlement) && entitlement !== ChatEntitlement.EDU ? manifest.paid : manifest.free;
 }
@@ -40,44 +37,40 @@ function getModelPickerControlModels(manifest, entitlement, models) {
 function shouldShowManageModelsAction(chatEntitlementService) {
     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) {
+function createManageModelsAction(commandService, sessionType) {
     return {
         id: "manageModels",
         enabled: true,
         checked: false,
         class: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(12232, "Manage Language Models")),
-        label: ( localize(12233, "Manage Models...")),
+        tooltip: ( localize(14556, "Manage Language Models")),
+        label: ( localize(14557, "Manage Models...")),
         run: () => {
-            commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
+            commandService.executeCommand(MANAGE_CHAT_COMMAND_ID, undefined, sessionType);
         }
     };
 }
-function buildModelPickerItems(options) {
-    const unavailableItems = buildUnavailableStateItems(options);
-    if (unavailableItems) {
-        return unavailableItems;
-    }
-    return options.presentation.useGroupedModelPicker ? buildGroupedModelItems(options) : buildFlatModelItems(options);
-}
-function getModelPickerAccessibilityProvider(isSearch = false) {
+function getModelPickerAccessibilityProvider(isSearch = false, multiple = false) {
     return {
         getAriaLabel(element) {
             if (element.kind !== ActionListItemKind.Action) {
-                return null;
+                return element.additionalBadges?.length ? [element.label, ...element.additionalBadges.map(badge => badge.label)].join(", ") : null;
             }
             const description = element.ariaDescription ?? (typeof element.description === "string" ? element.description : element.description?.value);
-            const currentModel = isSearch && element.item?.checked ? ( localize(12234, "Current model")) : undefined;
-            return [element.label, element.badge, description, currentModel].filter(part => !!part).join(", ");
+            const currentModel = isSearch && element.item?.checked ? (multiple ? ( localize(14558, "Selected")) : ( localize(14559, "Current model"))) : undefined;
+            return [
+                element.label,
+                element.badge,
+                ...(element.additionalBadges?.map(badge => badge.label) ?? []),
+                description,
+                currentModel
+            ].filter(part => !!part).join(", ");
         },
         isChecked(element) {
             if (isSearch || element.isSectionToggle) {
                 return undefined;
             }
-            if (element.kind === ActionListItemKind.Action && !(element.item?.id && ( PICKER_COMMAND_ACTION_IDS.has(element.item.id)))) {
-                return !!element.item?.checked;
-            }
-            return undefined;
+            return element.kind === ActionListItemKind.Action ? !!element.item?.checked : undefined;
         },
         getRole: element => {
             if (isSearch) {
@@ -88,7 +81,7 @@ function getModelPickerAccessibilityProvider(isSearch = false) {
             }
             switch (element.kind) {
             case ActionListItemKind.Action:
-                return element.item?.id && ( PICKER_COMMAND_ACTION_IDS.has(element.item.id)) ? "menuitem" : "menuitemradio";
+                return multiple ? "menuitemcheckbox" : "menuitemradio";
             case ActionListItemKind.Separator:
             default:
                 return "separator";
@@ -98,4 +91,4 @@ function getModelPickerAccessibilityProvider(isSearch = false) {
     };
 }
 
-export { buildModelPickerItems, createManageModelsAction, getControlModelsForEntitlement, getModelPickerAccessibilityProvider, getModelPickerControlModels, shouldShowManageModelsAction };
+export { createManageModelsAction, getControlModelsForEntitlement, getModelPickerAccessibilityProvider, getModelPickerControlModels, shouldShowManageModelsAction };

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

@@ -1,5 +1,7 @@
+import { IStringDictionary } from "../../../../../../../base/common/collections.js";
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelConfigurationSchema, type IModelConfigurationAccess } from "../../../../common/languageModels.js";
 export type { IModelConfigurationAccess } from "../../../../common/languageModels.js";
+type ModelConfigurationReader = Pick<IModelConfigurationAccess, "getModelConfiguration" | "getModelConfigurationSchema">;
 /** The thinking effort group, or the routing tier for the Auto model. */
 export declare const MODEL_CONFIG_GROUP_EFFORT = "navigation";
 /** The context window group: how much context the model is given. */
@@ -12,10 +14,31 @@ export interface IModelConfigProperty {
     readonly schema: IModelConfigPropertySchema;
 }
 /**
- * The first property of a model's configuration schema belonging to `group` that
- * offers a choice, with the user's value or the schema default.
+ * Reports a configuration change once it is saved. `requestedAt` is when the
+ * change was requested, before it waited for earlier edits and the save.
  */
-export declare function getModelConfigProperty(model: ILanguageModelChatMetadataAndIdentifier | undefined, configurationAccess: IModelConfigurationAccess, group: string): IModelConfigProperty | undefined;
+export type ModelConfigChangeListener = (group: string, key: string, fromValue: unknown, toValue: unknown, requestedAt: number) => void;
+/** Serializes effective-value reads, writes, and change reporting per model and configuration scope. */
+export declare function setModelConfigValues(model: ILanguageModelChatMetadataAndIdentifier, configurationAccess: IModelConfigurationAccess, values: IStringDictionary<unknown>, onDidChange?: ModelConfigChangeListener): Promise<void>;
+/**
+ * Settles once the configuration edits queued for a scope finish and have reported
+ * their changes, or `undefined` when none are pending.
+ */
+export declare function whenModelConfigValuesSaved(configurationAccess: IModelConfigurationAccess): Promise<unknown> | undefined;
+/** Choice metadata shared by the inline picker and Details. */
+export declare function getModelConfigChoices(property: IModelConfigProperty, formatLabel?: (value: unknown, enumLabel: string | undefined) => string): {
+    index: number;
+    value: any;
+    label: string;
+    description: string | undefined;
+    checked: boolean;
+    isDefault: boolean;
+    readOnly: boolean;
+}[];
+/**
+ * Selects a property by explicit alias precedence, then schema order for unknown keys.
+ */
+export declare function getModelConfigProperty(model: ILanguageModelChatMetadataAndIdentifier | undefined, configurationAccess: ModelConfigurationReader, group: string): IModelConfigProperty | undefined;
 /** The label an enum value is shown with, falling back to a formatted raw value. */
 export declare function getModelConfigValueLabel(schema: IModelConfigPropertySchema, value: unknown): string;
 /**
@@ -24,13 +47,14 @@ export declare function getModelConfigValueLabel(schema: IModelConfigPropertySch
  * extended one.
  */
 export declare function isExtendedContext(property: IModelConfigProperty): boolean;
-/**
- * A short read-out of the model settings the user changed, e.g. "Extra high · 1M".
- *
- * Only values that differ from the model's own defaults are named: a model left alone
- * has nothing to report, so the read-out marks the models that were deliberately tuned
- * rather than restating a default on every row.
- */
-export declare function getModelConfigSummary(model: ILanguageModelChatMetadataAndIdentifier | undefined, configurationAccess: IModelConfigurationAccess): string | undefined;
+/** A short readout of the effective effort and context, including defaults. */
+export declare function getModelConfigSummary(model: ILanguageModelChatMetadataAndIdentifier | undefined, configurationAccess: ModelConfigurationReader): string | undefined;
+/** Names each displayed setting for assistive technology. */
+export declare function getModelConfigDescription(model: ILanguageModelChatMetadataAndIdentifier | undefined, configurationAccess: ModelConfigurationReader): string | undefined;
+export declare function getModelConfigDisplayValues(model: ILanguageModelChatMetadataAndIdentifier | undefined, configurationAccess: ModelConfigurationReader): {
+    group: string;
+    label: string;
+    description: string;
+}[];
 /** The effort and context properties whose effective values differ from their defaults. */
 export declare function getChangedModelConfigProperties(model: ILanguageModelChatMetadataAndIdentifier | undefined, configurationAccess: IModelConfigurationAccess): IModelConfigProperty[];

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

@@ -1,34 +1,122 @@
 
+import { SequencerByKey } from '../../../../../../../base/common/async.js';
 import { formatTokenCount } from '../../../../../../../base/common/numbers.js';
+import { localize } from '../../../../../../../nls.js';
+import { getModelContextWindowTotal } from '../../../../common/languageModels.js';
+import { isAutoModel, isHydraFusionModel } from './modelPickerPresentation.js';
 
-const MODEL_CONFIG_GROUP_EFFORT = 'navigation';
-const MODEL_CONFIG_GROUP_CONTEXT = 'tokens';
+const MODEL_CONFIG_GROUP_EFFORT = "navigation";
+const MODEL_CONFIG_GROUP_CONTEXT = "tokens";
+const configurationEdits = ( new WeakMap());
+function setModelConfigValues(model, configurationAccess, values, onDidChange) {
+    const requestedAt = Date.now();
+    let edits = configurationEdits.get(configurationAccess);
+    if (!edits) {
+        configurationEdits.set(configurationAccess, edits = ( new SequencerByKey()));
+    }
+    return edits.queue(model.identifier, async () => {
+        const changes = [MODEL_CONFIG_GROUP_EFFORT, MODEL_CONFIG_GROUP_CONTEXT].flatMap(group => {
+            const property = getModelConfigProperty(model, configurationAccess, group);
+            return property && Object.hasOwn(values, property.key) && property.value !== values[property.key] ? [{
+                group,
+                key: property.key,
+                fromValue: property.value,
+                toValue: values[property.key]
+            }] : [];
+        });
+        await configurationAccess.setModelConfiguration(model.identifier, values);
+        for (const change of changes) {
+            onDidChange?.(change.group, change.key, change.fromValue, change.toValue, requestedAt);
+        }
+    });
+}
+function whenModelConfigValuesSaved(configurationAccess) {
+    const edits = configurationEdits.get(configurationAccess);
+    const pending = edits ? [...( edits.keys())].map(key => edits.peek(key)) : [];
+    return pending.length ? Promise.allSettled(pending) : undefined;
+}
+function getModelConfigChoices(property, formatLabel) {
+    return (property.schema.enum ?? []).map((value, index) => ({
+        index,
+        value,
+        label: getModelConfigValueLabel(property.schema, value),
+        description: property.schema.enumDescriptions?.[index],
+        checked: value === property.value,
+        isDefault: value === property.schema.default,
+        readOnly: !!property.schema.readOnly
+    }));
+}
 function getModelConfigProperty(model, configurationAccess, group) {
-    const properties = model?.metadata.configurationSchema?.properties;
+    const properties = model && (configurationAccess.getModelConfigurationSchema?.(model.identifier) ?? model.metadata.configurationSchema)?.properties;
     if (!properties) {
         return undefined;
     }
     const currentConfig = configurationAccess.getModelConfiguration(model.identifier) ?? {};
-    for (const [key, schema] of Object.entries(properties)) {
+    const aliases = group === MODEL_CONFIG_GROUP_EFFORT ? ["tier", "autoTier", "thinkingLevel", "reasoningEffort"] : group === MODEL_CONFIG_GROUP_CONTEXT ? ["contextSize", "contextTier"] : [];
+    const alias = aliases.find(key => Object.hasOwn(properties, key) && properties[key].group === group);
+    const keys = alias ? [alias] : ( Object.keys(properties));
+    for (const key of keys) {
+        const schema = properties[key];
         if (schema.group !== group || !schema.enum?.length) {
             continue;
         }
-        return { key, value: currentConfig[key] ?? schema.default, schema };
+        const saved = Object.hasOwn(currentConfig, key) && (key !== "tier" || isOfferedAutoTier(schema, currentConfig[key]));
+        return {
+            key,
+            value: saved ? currentConfig[key] : schema.default,
+            schema
+        };
     }
     return undefined;
 }
+function isOfferedAutoTier(schema, value) {
+    return !!schema.enum?.includes(value) || (value === "fast" && !!schema.enum?.includes("efficiency"));
+}
 function getModelConfigValueLabel(schema, value) {
+    if (value === "fast" && schema.enum?.includes("efficiency") && !schema.enum.includes("fast")) {
+        return localize(14560, "Automatic");
+    }
     const index = schema.enum?.indexOf(value) ?? -1;
     const label = index >= 0 ? schema.enumItemLabels?.[index] : undefined;
-    return label ?? (typeof value === 'number' ? formatTokenCount(value) : String(value));
+    return label ?? (typeof value === "number" ? formatTokenCount(value) : String(value));
 }
 function isExtendedContext(property) {
     const values = property.schema.enum ?? [];
     return values.length > 1 && property.value === values[values.length - 1];
 }
 function getModelConfigSummary(model, configurationAccess) {
-    const parts = getChangedModelConfigProperties(model, configurationAccess).map(property => getModelConfigValueLabel(property.schema, property.value));
-    return parts.length ? parts.join(' \u00b7 ') : undefined;
+    const parts = getModelConfigDisplayValues(model, configurationAccess).map(value => value.label);
+    return parts.length ? parts.join(" · ") : undefined;
+}
+function getModelConfigDescription(model, configurationAccess) {
+    const parts = getModelConfigDisplayValues(model, configurationAccess).map(value => value.description);
+    return parts.length ? parts.join(", ") : undefined;
+}
+function getModelConfigDisplayValues(model, configurationAccess) {
+    const values = [];
+    for (const group of [MODEL_CONFIG_GROUP_EFFORT, MODEL_CONFIG_GROUP_CONTEXT]) {
+        const property = getModelConfigProperty(model, configurationAccess, group);
+        if (property?.value !== undefined && property.schema.enum?.includes(property.value)) {
+            const label = getModelConfigValueLabel(property.schema, property.value);
+            const title = property.schema.title ?? (group === MODEL_CONFIG_GROUP_EFFORT ? ( localize(14561, "Thinking Effort")) : ( localize(14562, "Context")));
+            values.push({
+                group,
+                label,
+                description: ( localize(14563, "{0}: {1}", title, label))
+            });
+        } else if (!property && group === MODEL_CONFIG_GROUP_CONTEXT && model && !isAutoModel(model) && !isHydraFusionModel(model)) {
+            const total = getModelContextWindowTotal(model.metadata);
+            if (Number.isFinite(total) && total > 0) {
+                const label = formatTokenCount(total);
+                values.push({
+                    group,
+                    label,
+                    description: ( localize(14564, "Max context: {0}", label))
+                });
+            }
+        }
+    }
+    return values;
 }
 function getChangedModelConfigProperties(model, configurationAccess) {
     const properties = [];
@@ -42,4 +130,4 @@ function getChangedModelConfigProperties(model, configurationAccess) {
     return properties;
 }
 
-export { MODEL_CONFIG_GROUP_CONTEXT, MODEL_CONFIG_GROUP_EFFORT, getChangedModelConfigProperties, getModelConfigProperty, getModelConfigSummary, getModelConfigValueLabel, isExtendedContext };
+export { MODEL_CONFIG_GROUP_CONTEXT, MODEL_CONFIG_GROUP_EFFORT, getChangedModelConfigProperties, getModelConfigChoices, getModelConfigDescription, getModelConfigDisplayValues, getModelConfigProperty, getModelConfigSummary, getModelConfigValueLabel, isExtendedContext, setModelConfigValues, whenModelConfigValuesSaved };

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

@@ -1,6 +1,22 @@
-import { ILanguageModelChatMetadataAndIdentifier } from "../../../../common/languageModels.js";
+import { IStringDictionary } from "../../../../../../../base/common/collections.js";
+import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, IModelControlEntry } from "../../../../common/languageModels.js";
+import { ILanguageModelsService } from "../../../../common/languageModels.service.js";
 import { ChatEntitlement } from "../../../../../../services/chat/common/chatEntitlementService.js";
 export declare function isAutoModel(model: ILanguageModelChatMetadataAndIdentifier): boolean;
+/**
+ * Whether the model is a Copilot CLI HydraFusion research preview (HydraFusion or HydraFusion Max).
+ * Ensemble offers them among its tiers; otherwise HydraFusion is a model of its own, with
+ * HydraFusion Max as its Max tier.
+ */
+export declare function isHydraFusionModel(model: ILanguageModelChatMetadataAndIdentifier): boolean;
+/** The label of a HydraFusion model as one of HydraFusion's own tiers, outside Ensemble. */
+export declare function getHydraFusionTierLabel(hydraFusionModelId: string): string;
+export declare function getEnsembleTierLabel(auto: ILanguageModelChatMetadata | undefined, hydraFusionModelId: string): string | undefined;
+/** Whether the plan offers built-in HydraFusion only as an upgrade, never as a choice. */
+export declare function isHydraFusionUpgradeOnly(entitlement: ChatEntitlement): boolean;
+export declare function filterModelPickerModelsForEntitlement(models: ILanguageModelChatMetadataAndIdentifier[], entitlement: ChatEntitlement, languageModelsService: ILanguageModelsService): ILanguageModelChatMetadataAndIdentifier[];
+export declare function filterModelPickerModelsForEntitlement(models: readonly ILanguageModelChatMetadataAndIdentifier[], entitlement: ChatEntitlement, languageModelsService: ILanguageModelsService): readonly ILanguageModelChatMetadataAndIdentifier[];
+export declare function filterModelPickerControlModelsForEntitlement(controlModels: IStringDictionary<IModelControlEntry>, models: readonly ILanguageModelChatMetadataAndIdentifier[], entitlement: ChatEntitlement, languageModelsService: ILanguageModelsService): IStringDictionary<IModelControlEntry>;
 export declare function isMultiplierPricing(model: ILanguageModelChatMetadataAndIdentifier): boolean;
 export declare function getPriceCategoryLabel(priceCategory: string | undefined): string | undefined;
 export declare function isHighCostCategory(priceCategory: string | undefined): boolean;

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

@@ -1,11 +1,71 @@
 
 import { localize } from '../../../../../../../nls.js';
-import { isAutoLanguageModel } from '../../../../common/languageModels.js';
+import { isCopilotHydraFusionModelId, COPILOT_HYDRA_FUSION_MAX_MODEL_ID, COPILOT_HYDRA_FUSION_MODEL_ID } from '../../../../../../../platform/agentHost/common/copilotCliConfig.js';
+import { COPILOT_CLI_AGENT_PROVIDER_ID } from '../../../../../../../platform/agentHost/common/agent.js';
+import { getEnsembleAutoModeTierLabel } from '../../../../../../../platform/agentHost/common/autoModeTiers.js';
+import { isAutoLanguageModel, isUserProvidedModel } from '../../../../common/languageModels.js';
 import { ChatEntitlement } from '../../../../../../services/chat/common/chatEntitlementService.js';
 
 function isAutoModel(model) {
     return isAutoLanguageModel(model);
 }
+function isHydraFusionModel(model) {
+    return model.metadata.modelGroup?.id === COPILOT_CLI_AGENT_PROVIDER_ID && isCopilotHydraFusionModelId(model.metadata.id);
+}
+function getHydraFusionTierLabel(hydraFusionModelId) {
+    return hydraFusionModelId === COPILOT_HYDRA_FUSION_MAX_MODEL_ID ? ( localize(14565, "Max")) : ( localize(14566, "Default"));
+}
+function getEnsembleTierLabel(auto, hydraFusionModelId) {
+    if (!auto?.autoModelEnsemble) {
+        return undefined;
+    }
+    if (hydraFusionModelId === COPILOT_HYDRA_FUSION_MAX_MODEL_ID) {
+        return localize(14567, "Max");
+    }
+    const intelligence = "intelligence";
+    if (hydraFusionModelId !== COPILOT_HYDRA_FUSION_MODEL_ID || !auto.autoModelEnsemble.intelligenceUsesHydraFusion) {
+        return undefined;
+    }
+    const tier = ( Object.values(auto.configurationSchema?.properties ?? {})).find(property => property.enum?.includes(intelligence));
+    return tier ? tier.enumItemLabels?.[tier.enum.indexOf(intelligence)] ?? getEnsembleAutoModeTierLabel(intelligence) : undefined;
+}
+function isHydraFusionUpgradeOnly(entitlement) {
+    return entitlement === ChatEntitlement.Free || entitlement === ChatEntitlement.EDU;
+}
+function filterModelPickerModelsForEntitlement(models, entitlement, languageModelsService) {
+    return isHydraFusionUpgradeOnly(entitlement) ? models.filter(
+        model => !isHydraFusionModel(model) || isUserProvidedModel(model, languageModelsService)
+    ) : models;
+}
+function filterModelPickerControlModelsForEntitlement(controlModels, models, entitlement, languageModelsService) {
+    if (!isHydraFusionUpgradeOnly(entitlement)) {
+        return controlModels;
+    }
+    const hydraFusion = controlModels[COPILOT_HYDRA_FUSION_MODEL_ID];
+    const liveHydraFusion = models.find(
+        model => model.metadata.id === COPILOT_HYDRA_FUSION_MODEL_ID && isHydraFusionModel(model) && !isUserProvidedModel(model, languageModelsService)
+    );
+    if (!liveHydraFusion) {
+        if (!hydraFusion) {
+            return controlModels;
+        }
+        const modelsWithoutHydraFusion = {
+            ...controlModels
+        };
+        delete modelsWithoutHydraFusion[COPILOT_HYDRA_FUSION_MODEL_ID];
+        return modelsWithoutHydraFusion;
+    }
+    return {
+        ...controlModels,
+        [COPILOT_HYDRA_FUSION_MODEL_ID]: {
+            ...hydraFusion,
+            label: hydraFusion?.label ?? liveHydraFusion.metadata.name,
+            featured: true,
+            exists: false,
+            minVSCodeVersion: undefined
+        }
+    };
+}
 function isMultiplierPricing(model) {
     return model.metadata.multiplierNumeric !== undefined;
 }
@@ -15,16 +75,16 @@ function getPriceCategoryLabel(priceCategory) {
     }
     switch (priceCategory) {
     case "low":
-        return localize(12235, "Low cost");
+        return localize(14568, "Low cost");
     case "medium":
-        return localize(12236, "Medium cost");
+        return localize(14569, "Medium cost");
     case "high":
-        return localize(12237, "High cost");
+        return localize(14570, "High cost");
     case "very_high":
-        return localize(12238, "Very high cost");
+        return localize(14571, "Very high cost");
     default:
         return localize(
-            12239,
+            14572,
             "{0} cost",
             priceCategory.charAt(0).toUpperCase() + priceCategory.slice(1)
         );
@@ -39,11 +99,11 @@ function getCategoryLabel(category) {
     case "":
         return undefined;
     case "lightweight":
-        return localize(12240, "Lightweight");
+        return localize(14573, "Lightweight");
     case "versatile":
-        return localize(12241, "Versatile");
+        return localize(14574, "Versatile");
     case "powerful":
-        return localize(12242, "Powerful");
+        return localize(14575, "Powerful");
     default:
         return typeof category === "string" ? category.charAt(0).toUpperCase() + category.slice(1) : undefined;
     }
@@ -76,4 +136,4 @@ function shouldShowCacheBreakHint(context) {
     return !(context.excludeAutoModel && context.selectedModelIsAuto);
 }
 
-export { ModelPickerUnavailableReason, getCategoryLabel, getModelPickerUnavailableReason, getPriceCategoryLabel, isAutoModel, isHighCostCategory, isMultiplierPricing, modelPickerRequiresSetup, shouldShowCacheBreakHint };
+export { ModelPickerUnavailableReason, filterModelPickerControlModelsForEntitlement, filterModelPickerModelsForEntitlement, getCategoryLabel, getEnsembleTierLabel, getHydraFusionTierLabel, getModelPickerUnavailableReason, getPriceCategoryLabel, isAutoModel, isHighCostCategory, isHydraFusionModel, isHydraFusionUpgradeOnly, isMultiplierPricing, modelPickerRequiresSetup, shouldShowCacheBreakHint };