@codingame/monaco-vscode-katex-common 28.4.0 → 29.0.0

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

@@ -10,18 +10,21 @@ import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyC
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ActionListItemKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionList';
 import { IActionWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 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 { isProUser, ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { ChatEntitlement, isProUser } 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';
 import { StateType } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update';
 import { IUpdateService } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -41,20 +44,20 @@ function getUpdateHoverContent(updateState) {
     switch (updateState) {
     case StateType.AvailableForDownload:
         hoverContent.appendMarkdown(( localize(
-            6788,
+            6990,
             "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(
-            6789,
+            6991,
             "This model requires a newer version of VS Code. [Restart to Update](command:update.restartToUpdate) to access it."
         )));
         break;
     default:
         hoverContent.appendMarkdown(( localize(
-            6790,
+            6992,
             "This model requires a newer version of VS Code. [Update VS Code](command:update.checkForUpdate) to access it."
         )));
         break;
@@ -64,7 +67,7 @@ function getUpdateHoverContent(updateState) {
 const ModelPickerSection = {
     Other: "other"
 };
-function createModelItem(action, model) {
+function createModelItem(action, model, hoverPosition, languageModelsService) {
     return {
         item: action,
         kind: ActionListItemKind.Action,
@@ -77,24 +80,69 @@ function createModelItem(action, model) {
         hideIcon: false,
         section: action.section,
         hover: model ? {
-            content: getModelHoverContent(model)
-        } : undefined
+            content: getModelHoverContent(model, languageModelsService),
+            position: hoverPosition
+        } : undefined,
+        submenuActions: action.toolbarActions
     };
 }
-function createModelAction(model, selectedModelId, onSelect, section) {
+function getModelConfigurationDescription(model, languageModelsService) {
+    const schema = model.metadata.configurationSchema;
+    if (!schema?.properties) {
+        return undefined;
+    }
+    const currentConfig = languageModelsService.getModelConfiguration(model.identifier) ?? {};
+    const parts = [];
+    for (const [key, propSchema] of Object.entries(schema.properties)) {
+        if (propSchema.group !== "navigation") {
+            continue;
+        }
+        const value = currentConfig[key] ?? propSchema.default;
+        if (value === undefined) {
+            continue;
+        }
+        const enumItemLabels = propSchema.enumItemLabels;
+        const enumIndex = propSchema.enum?.indexOf(value) ?? -1;
+        const label = enumItemLabels?.[enumIndex] ?? String(value);
+        parts.push(label);
+    }
+    return parts.length > 0 ? parts.join(", ") : undefined;
+}
+function createModelAction(model, selectedModelId, onSelect, languageModelsService, section) {
+    const toolbarActions = languageModelsService.getModelConfigurationActions(model.identifier);
+    const configDescription = getModelConfigurationDescription(model, languageModelsService);
+    const baseDescription = model.metadata.multiplier ?? model.metadata.detail;
+    const description = configDescription && baseDescription ? `${configDescription} · ${baseDescription}` : configDescription ?? baseDescription;
     return {
         id: model.identifier,
         enabled: true,
         icon: model.metadata.statusIcon,
         checked: model.identifier === selectedModelId,
         class: undefined,
-        description: model.metadata.multiplier ?? model.metadata.detail,
+        description,
         tooltip: model.metadata.name,
         label: model.metadata.name,
         section,
+        toolbarActions: toolbarActions && toolbarActions.length > 0 ? toolbarActions : undefined,
         run: () => onSelect(model)
     };
 }
+function shouldShowManageModelsAction(chatEntitlementService) {
+    return chatEntitlementService.entitlement === ChatEntitlement.Free || chatEntitlementService.entitlement === ChatEntitlement.Pro || chatEntitlementService.entitlement === ChatEntitlement.ProPlus || chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise || chatEntitlementService.isInternal;
+}
+function createManageModelsAction(commandService) {
+    return {
+        id: "manageModels",
+        enabled: true,
+        checked: false,
+        class: ThemeIcon.asClassName(Codicon.gear),
+        tooltip: ( localize(6993, "Manage Language Models")),
+        label: ( localize(6994, "Manage Models...")),
+        run: () => {
+            commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
+        }
+    };
+}
 function buildModelPickerItems(
     models,
     selectedModelId,
@@ -104,9 +152,13 @@ function buildModelPickerItems(
     updateStateType,
     onSelect,
     manageSettingsUrl,
-    canManageModels,
-    commandService,
-    chatEntitlementService
+    useGroupedModelPicker,
+    manageModelsAction,
+    chatEntitlementService,
+    showUnavailableFeatured,
+    showFeatured,
+    hoverPosition,
+    languageModelsService
 ) {
     const items = [];
     if (models.length === 0) {
@@ -115,249 +167,268 @@ function buildModelPickerItems(
             enabled: true,
             checked: true,
             class: undefined,
-            tooltip: ( localize(6791, "Auto")),
-            label: ( localize(6791, "Auto")),
+            tooltip: ( localize(6995, "Auto")),
+            label: ( localize(6995, "Auto")),
             run: () => {}
         }));
     }
-    if (!canManageModels) {
-        const autoModel = models.find(m => m.metadata.id === "auto" && m.metadata.vendor === "copilot");
-        if (autoModel) {
-            items.push(
-                createModelItem(createModelAction(autoModel, selectedModelId, onSelect), autoModel)
-            );
-        }
-        const sortedModels = models.filter(m => m !== autoModel).sort((a, b) => {
-            const vendorCmp = a.metadata.vendor.localeCompare(b.metadata.vendor);
-            return vendorCmp !== 0 ? vendorCmp : a.metadata.name.localeCompare(b.metadata.name);
-        });
-        for (const model of sortedModels) {
-            items.push(
-                createModelItem(createModelAction(model, selectedModelId, onSelect), model)
-            );
-        }
-        return items;
-    }
-    const isPro = isProUser(chatEntitlementService.entitlement);
-    let otherModels = [];
-    if (models.length) {
-        const allModelsMap = ( new Map());
-        const modelsByMetadataId = ( new Map());
-        for (const model of models) {
-            allModelsMap.set(model.identifier, model);
-            modelsByMetadataId.set(model.metadata.id, model);
-        }
-        const placed = ( new Set());
-        const markPlaced = (identifierOrId, metadataId) => {
-            placed.add(identifierOrId);
-            if (metadataId) {
-                placed.add(metadataId);
-            }
-        };
-        const resolveModel = id => allModelsMap.get(id) ?? modelsByMetadataId.get(id);
-        const getUnavailableReason = entry => {
-            if (!isPro) {
-                return "upgrade";
-            }
-            if (entry.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
-                return "update";
-            }
-            return "admin";
-        };
-        const autoModel = models.find(m => m.metadata.id === "auto" && m.metadata.vendor === "copilot");
-        if (autoModel) {
-            markPlaced(autoModel.identifier, autoModel.metadata.id);
-            items.push(
-                createModelItem(createModelAction(autoModel, selectedModelId, onSelect), autoModel)
-            );
-        }
-        const promotedItems = [];
-        const tryPlaceModel = id => {
-            if (( placed.has(id))) {
-                return false;
+    if (useGroupedModelPicker) {
+        let otherModels = [];
+        if (models.length) {
+            const allModelsMap = ( new Map());
+            const modelsByMetadataId = ( new Map());
+            for (const model of models) {
+                allModelsMap.set(model.identifier, model);
+                modelsByMetadataId.set(model.metadata.id, model);
             }
-            const model = resolveModel(id);
-            if (model && !( placed.has(model.identifier))) {
-                markPlaced(model.identifier, model.metadata.id);
-                const entry = controlModels[model.metadata.id];
-                if (entry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
-                    promotedItems.push({
-                        kind: "unavailable",
-                        id: model.metadata.id,
-                        entry,
-                        reason: "update"
-                    });
-                } else {
-                    promotedItems.push({
-                        kind: "available",
-                        model
-                    });
+            const placed = ( new Set());
+            const markPlaced = (identifierOrId, metadataId) => {
+                placed.add(identifierOrId);
+                if (metadataId) {
+                    placed.add(metadataId);
+                }
+            };
+            const resolveModel = id => allModelsMap.get(id) ?? modelsByMetadataId.get(id);
+            const getUnavailableReason = entry => {
+                const isBusinessOrEnterpriseUser = chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise;
+                if (!isBusinessOrEnterpriseUser) {
+                    return "upgrade";
+                }
+                if (entry.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
+                    return "update";
                 }
-                return true;
+                return "admin";
+            };
+            const autoModel = models.find(m => m.metadata.id === "auto" && m.metadata.vendor === "copilot");
+            if (autoModel) {
+                markPlaced(autoModel.identifier, autoModel.metadata.id);
+                items.push(createModelItem(
+                    createModelAction(autoModel, selectedModelId, onSelect, languageModelsService),
+                    autoModel,
+                    hoverPosition,
+                    languageModelsService
+                ));
             }
-            if (!model) {
-                const entry = controlModels[id];
-                if (entry && !entry.exists) {
-                    markPlaced(id);
-                    promotedItems.push({
-                        kind: "unavailable",
-                        id,
-                        entry,
-                        reason: getUnavailableReason(entry)
-                    });
+            const promotedItems = [];
+            const tryPlaceModel = id => {
+                if (( placed.has(id))) {
+                    return false;
+                }
+                const model = resolveModel(id);
+                if (model && !( placed.has(model.identifier))) {
+                    markPlaced(model.identifier, model.metadata.id);
+                    const entry = controlModels[model.metadata.id];
+                    if (entry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
+                        promotedItems.push({
+                            kind: "unavailable",
+                            id: model.metadata.id,
+                            entry,
+                            reason: "update"
+                        });
+                    } else {
+                        promotedItems.push({
+                            kind: "available",
+                            model
+                        });
+                    }
                     return true;
                 }
+                if (!model) {
+                    const entry = controlModels[id];
+                    if (entry && !entry.exists) {
+                        markPlaced(id);
+                        promotedItems.push({
+                            kind: "unavailable",
+                            id,
+                            entry,
+                            reason: getUnavailableReason(entry)
+                        });
+                        return true;
+                    }
+                }
+                return false;
+            };
+            if (selectedModelId && selectedModelId !== autoModel?.identifier) {
+                tryPlaceModel(selectedModelId);
             }
-            return false;
-        };
-        if (selectedModelId && selectedModelId !== autoModel?.identifier) {
-            tryPlaceModel(selectedModelId);
-        }
-        for (const id of recentModelIds) {
-            tryPlaceModel(id);
-        }
-        for (const [entryId, entry] of Object.entries(controlModels)) {
-            if (!entry.featured || ( placed.has(entryId))) {
-                continue;
+            for (const id of recentModelIds) {
+                tryPlaceModel(id);
             }
-            const model = resolveModel(entryId);
-            if (model && !( placed.has(model.identifier))) {
-                markPlaced(model.identifier, model.metadata.id);
-                if (entry.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
-                    promotedItems.push({
-                        kind: "unavailable",
-                        id: entryId,
-                        entry,
-                        reason: "update"
-                    });
-                } else {
-                    promotedItems.push({
-                        kind: "available",
-                        model
-                    });
+            if (showFeatured) {
+                for (const [entryId, entry] of Object.entries(controlModels)) {
+                    if (!entry.featured || ( placed.has(entryId))) {
+                        continue;
+                    }
+                    const model = resolveModel(entryId);
+                    if (model && !( placed.has(model.identifier))) {
+                        if (entry.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
+                            if (showUnavailableFeatured) {
+                                markPlaced(model.identifier, model.metadata.id);
+                                promotedItems.push({
+                                    kind: "unavailable",
+                                    id: entryId,
+                                    entry,
+                                    reason: "update"
+                                });
+                            }
+                        } else {
+                            markPlaced(model.identifier, model.metadata.id);
+                            promotedItems.push({
+                                kind: "available",
+                                model
+                            });
+                        }
+                    } else if (!model && !entry.exists) {
+                        if (showUnavailableFeatured) {
+                            markPlaced(entryId);
+                            promotedItems.push({
+                                kind: "unavailable",
+                                id: entryId,
+                                entry,
+                                reason: getUnavailableReason(entry)
+                            });
+                        }
+                    }
                 }
-            } else if (!model && !entry.exists) {
-                markPlaced(entryId);
-                promotedItems.push({
-                    kind: "unavailable",
-                    id: entryId,
-                    entry,
-                    reason: getUnavailableReason(entry)
+            }
+            if (promotedItems.length > 0) {
+                promotedItems.sort((a, b) => {
+                    const aAvail = a.kind === "available" ? 0 : 1;
+                    const bAvail = b.kind === "available" ? 0 : 1;
+                    if (aAvail !== bAvail) {
+                        return aAvail - bAvail;
+                    }
+                    const aName = a.kind === "available" ? a.model.metadata.name : a.entry.label;
+                    const bName = b.kind === "available" ? b.model.metadata.name : b.entry.label;
+                    return aName.localeCompare(bName);
                 });
+                for (const item of promotedItems) {
+                    if (item.kind === "available") {
+                        items.push(createModelItem(
+                            createModelAction(item.model, selectedModelId, onSelect, languageModelsService),
+                            item.model,
+                            hoverPosition,
+                            languageModelsService
+                        ));
+                    } else {
+                        items.push(createUnavailableModelItem(
+                            item.id,
+                            item.entry,
+                            item.reason,
+                            manageSettingsUrl,
+                            updateStateType,
+                            undefined,
+                            hoverPosition
+                        ));
+                    }
+                }
             }
-        }
-        if (promotedItems.length > 0) {
-            promotedItems.sort((a, b) => {
-                const aAvail = a.kind === "available" ? 0 : 1;
-                const bAvail = b.kind === "available" ? 0 : 1;
+            otherModels = models.filter(m => !( placed.has(m.identifier)) && !( placed.has(m.metadata.id))).sort((a, b) => {
+                const aEntry = controlModels[a.metadata.id] ?? controlModels[a.identifier];
+                const bEntry = controlModels[b.metadata.id] ?? controlModels[b.identifier];
+                const aAvail = aEntry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, aEntry.minVSCodeVersion) ? 1 : 0;
+                const bAvail = bEntry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, bEntry.minVSCodeVersion) ? 1 : 0;
                 if (aAvail !== bAvail) {
                     return aAvail - bAvail;
                 }
-                const aName = a.kind === "available" ? a.model.metadata.name : a.entry.label;
-                const bName = b.kind === "available" ? b.model.metadata.name : b.entry.label;
-                return aName.localeCompare(bName);
+                const aCopilot = a.metadata.vendor === "copilot" ? 0 : 1;
+                const bCopilot = b.metadata.vendor === "copilot" ? 0 : 1;
+                if (aCopilot !== bCopilot) {
+                    return aCopilot - bCopilot;
+                }
+                const vendorCmp = a.metadata.vendor.localeCompare(b.metadata.vendor);
+                return vendorCmp !== 0 ? vendorCmp : a.metadata.name.localeCompare(b.metadata.name);
             });
-            for (const item of promotedItems) {
-                if (item.kind === "available") {
-                    items.push(
-                        createModelItem(createModelAction(item.model, selectedModelId, onSelect), item.model)
-                    );
-                } else {
-                    items.push(
-                        createUnavailableModelItem(item.id, item.entry, item.reason, manageSettingsUrl, updateStateType)
-                    );
+            if (otherModels.length > 0) {
+                if (items.length > 0) {
+                    items.push({
+                        kind: ActionListItemKind.Separator
+                    });
                 }
-            }
-        }
-        otherModels = models.filter(m => !( placed.has(m.identifier)) && !( placed.has(m.metadata.id))).sort((a, b) => {
-            const aEntry = controlModels[a.metadata.id] ?? controlModels[a.identifier];
-            const bEntry = controlModels[b.metadata.id] ?? controlModels[b.identifier];
-            const aAvail = aEntry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, aEntry.minVSCodeVersion) ? 1 : 0;
-            const bAvail = bEntry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, bEntry.minVSCodeVersion) ? 1 : 0;
-            if (aAvail !== bAvail) {
-                return aAvail - bAvail;
-            }
-            const aCopilot = a.metadata.vendor === "copilot" ? 0 : 1;
-            const bCopilot = b.metadata.vendor === "copilot" ? 0 : 1;
-            if (aCopilot !== bCopilot) {
-                return aCopilot - bCopilot;
-            }
-            const vendorCmp = a.metadata.vendor.localeCompare(b.metadata.vendor);
-            return vendorCmp !== 0 ? vendorCmp : a.metadata.name.localeCompare(b.metadata.name);
-        });
-        if (otherModels.length > 0) {
-            if (items.length > 0) {
                 items.push({
-                    kind: ActionListItemKind.Separator
+                    item: {
+                        id: "otherModels",
+                        enabled: true,
+                        checked: false,
+                        class: undefined,
+                        tooltip: ( localize(6996, "Other Models")),
+                        label: ( localize(6996, "Other Models")),
+                        run: () => {}
+                    },
+                    kind: ActionListItemKind.Action,
+                    label: ( localize(6996, "Other Models")),
+                    group: {
+                        title: "",
+                        icon: Codicon.chevronDown
+                    },
+                    hideIcon: false,
+                    section: ModelPickerSection.Other,
+                    isSectionToggle: true
                 });
+                for (const model of otherModels) {
+                    const entry = controlModels[model.metadata.id] ?? controlModels[model.identifier];
+                    if (entry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
+                        items.push(createUnavailableModelItem(
+                            model.metadata.id,
+                            entry,
+                            "update",
+                            manageSettingsUrl,
+                            updateStateType,
+                            ModelPickerSection.Other,
+                            hoverPosition
+                        ));
+                    } else {
+                        items.push(createModelItem(createModelAction(
+                            model,
+                            selectedModelId,
+                            onSelect,
+                            languageModelsService,
+                            ModelPickerSection.Other
+                        ), model, hoverPosition, languageModelsService));
+                    }
+                }
             }
+        }
+        if (manageModelsAction) {
             items.push({
-                item: {
-                    id: "otherModels",
-                    enabled: true,
-                    checked: false,
-                    class: undefined,
-                    tooltip: ( localize(6792, "Other Models")),
-                    label: ( localize(6792, "Other Models")),
-                    run: () => {}
-                },
+                kind: ActionListItemKind.Separator,
+                section: otherModels.length ? ModelPickerSection.Other : undefined
+            });
+            items.push({
+                item: manageModelsAction,
                 kind: ActionListItemKind.Action,
-                label: ( localize(6792, "Other Models")),
+                label: manageModelsAction.label,
                 group: {
                     title: "",
-                    icon: Codicon.chevronDown
+                    icon: Codicon.blank
                 },
                 hideIcon: false,
-                section: ModelPickerSection.Other,
-                isSectionToggle: true
+                section: otherModels.length ? ModelPickerSection.Other : undefined,
+                showAlways: true
             });
-            for (const model of otherModels) {
-                const entry = controlModels[model.metadata.id] ?? controlModels[model.identifier];
-                if (entry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
-                    items.push(createUnavailableModelItem(
-                        model.metadata.id,
-                        entry,
-                        "update",
-                        manageSettingsUrl,
-                        updateStateType,
-                        ModelPickerSection.Other
-                    ));
-                } else {
-                    items.push(createModelItem(
-                        createModelAction(model, selectedModelId, onSelect, ModelPickerSection.Other),
-                        model
-                    ));
-                }
-            }
         }
-    }
-    if (chatEntitlementService.entitlement === ChatEntitlement.Free || chatEntitlementService.entitlement === ChatEntitlement.Pro || chatEntitlementService.entitlement === ChatEntitlement.ProPlus || chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise || chatEntitlementService.isInternal) {
-        items.push({
-            kind: ActionListItemKind.Separator,
-            section: otherModels.length ? ModelPickerSection.Other : undefined
-        });
-        items.push({
-            item: {
-                id: "manageModels",
-                enabled: true,
-                checked: false,
-                class: undefined,
-                tooltip: ( localize(6793, "Manage Language Models")),
-                label: ( localize(6794, "Manage Models...")),
-                run: () => {
-                    commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
-                }
-            },
-            kind: ActionListItemKind.Action,
-            label: ( localize(6794, "Manage Models...")),
-            group: {
-                title: "",
-                icon: Codicon.blank
-            },
-            hideIcon: false,
-            section: otherModels.length ? ModelPickerSection.Other : undefined,
-            showAlways: true
+    } else {
+        const autoModel = models.find(m => m.metadata.id === "auto" && m.metadata.vendor === "copilot");
+        if (autoModel) {
+            items.push(createModelItem(
+                createModelAction(autoModel, selectedModelId, onSelect, languageModelsService),
+                autoModel,
+                hoverPosition,
+                languageModelsService
+            ));
+        }
+        const sortedModels = models.filter(m => m !== autoModel).sort((a, b) => {
+            const vendorCmp = a.metadata.vendor.localeCompare(b.metadata.vendor);
+            return vendorCmp !== 0 ? vendorCmp : a.metadata.name.localeCompare(b.metadata.name);
         });
+        for (const model of sortedModels) {
+            items.push(createModelItem(
+                createModelAction(model, selectedModelId, onSelect, languageModelsService),
+                model,
+                hoverPosition,
+                languageModelsService
+            ));
+        }
     }
     return items;
 }
@@ -379,18 +450,26 @@ function getModelPickerAccessibilityProvider() {
         getWidgetRole: () => "menu"
     };
 }
-function createUnavailableModelItem(id, entry, reason, manageSettingsUrl, updateStateType, section) {
+function createUnavailableModelItem(
+    id,
+    entry,
+    reason,
+    manageSettingsUrl,
+    updateStateType,
+    section,
+    hoverPosition
+) {
     let description;
     if (reason === "upgrade") {
-        description = ( new MarkdownString(( localize(6795, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
+        description = ( new MarkdownString(( localize(6997, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
             isTrusted: true
         }));
     } else if (reason === "update") {
-        description = ( localize(6796, "Update VS Code"));
+        description = ( localize(6998, "Update VS Code"));
     } else {
-        description = manageSettingsUrl ? ( new MarkdownString(( localize(6797, "[Contact your admin]({0})", manageSettingsUrl)), {
+        description = manageSettingsUrl ? ( new MarkdownString(( localize(6999, "[Contact your admin]({0})", manageSettingsUrl)), {
             isTrusted: true
-        })) : ( localize(6798, "Contact your admin"));
+        })) : ( localize(7000, "Contact your admin"));
     }
     let hoverContent;
     if (reason === "upgrade") {
@@ -399,7 +478,7 @@ function createUnavailableModelItem(id, entry, reason, manageSettingsUrl, update
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            6799,
+            7001,
             "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan \" \") with a free 30-day trial to use the best models."
         )));
     } else if (reason === "update") {
@@ -410,7 +489,7 @@ function createUnavailableModelItem(id, entry, reason, manageSettingsUrl, update
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            6800,
+            7002,
             "This model is not available. Contact your administrator to enable it."
         )));
     }
@@ -437,7 +516,8 @@ function createUnavailableModelItem(id, entry, reason, manageSettingsUrl, update
         className: "chat-model-picker-unavailable",
         section,
         hover: {
-            content: hoverContent
+            content: hoverContent,
+            position: hoverPosition
         }
     };
 }
@@ -450,25 +530,34 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
     }
     constructor(
         _delegate,
+        _hoverPosition,
         _actionWidgetService,
         _commandService,
+        _openerService,
         _telemetryService,
         _languageModelsService,
         _productService,
         _entitlementService,
-        _updateService
+        _updateService,
+        _uriIdentityService
     ) {
         super();
         this._delegate = _delegate;
+        this._hoverPosition = _hoverPosition;
         this._actionWidgetService = _actionWidgetService;
         this._commandService = _commandService;
+        this._openerService = _openerService;
         this._telemetryService = _telemetryService;
         this._languageModelsService = _languageModelsService;
         this._productService = _productService;
         this._entitlementService = _entitlementService;
         this._updateService = _updateService;
+        this._uriIdentityService = _uriIdentityService;
         this._onDidChangeSelection = this._register(( new Emitter()));
         this.onDidChangeSelection = this._onDidChangeSelection.event;
+        this._register(this._languageModelsService.onDidChangeLanguageModels(() => {
+            this._renderLabel();
+        }));
     }
     setHideChevrons(hideChevrons) {
         this._hideChevrons = hideChevrons;
@@ -531,9 +620,18 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             this._onDidChangeSelection.fire(model);
         };
         const models = this._delegate.getModels();
+        const showFilter = models.length >= 10;
         const isPro = isProUser(this._entitlementService.entitlement);
         const manifest = this._languageModelsService.getModelsControlManifest();
         const controlModelsForTier = isPro ? manifest.paid : manifest.free;
+        const canShowManageModelsAction = this._delegate.showManageModelsAction() && shouldShowManageModelsAction(this._entitlementService);
+        const manageModelsAction = canShowManageModelsAction ? createManageModelsAction(this._commandService) : undefined;
+        const logModelPickerInteraction = interaction => {
+            this._telemetryService.publicLog2("chat.modelPickerInteraction", {
+                interaction
+            });
+        };
+        const manageSettingsUrl = this._productService.defaultChatAgent?.manageSettingsUrl;
         const items = buildModelPickerItems(
             models,
             this._selectedModel?.identifier,
@@ -542,16 +640,36 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             this._productService.version,
             this._updateService.state.type,
             onSelect,
-            this._productService.defaultChatAgent?.manageSettingsUrl,
-            this._delegate.canManageModels(),
-            this._commandService,
-            this._entitlementService
+            manageSettingsUrl,
+            this._delegate.useGroupedModelPicker(),
+            !showFilter ? manageModelsAction : undefined,
+            this._entitlementService,
+            this._delegate.showUnavailableFeatured(),
+            this._delegate.showFeatured(),
+            this._hoverPosition,
+            this._languageModelsService
         );
         const listOptions = {
-            showFilter: models.length >= 10,
-            filterPlaceholder: ( localize(6801, "Search models")),
+            showFilter,
+            filterPlaceholder: ( localize(7003, "Search models")),
+            filterActions: showFilter && manageModelsAction ? [manageModelsAction] : undefined,
             focusFilterOnOpen: true,
             collapsedByDefault: ( new Set([ModelPickerSection.Other])),
+            onDidToggleSection: (section, collapsed) => {
+                if (section === ModelPickerSection.Other) {
+                    logModelPickerInteraction(collapsed ? "otherModelsCollapsed" : "otherModelsExpanded");
+                }
+            },
+            linkHandler: uri => {
+                if (uri.scheme === "command" && uri.path === "workbench.action.chat.upgradePlan") {
+                    logModelPickerInteraction("premiumModelUpgradePlanClicked");
+                } else if (manageSettingsUrl && this._uriIdentityService.extUri.isEqual(uri, ( URI.parse(manageSettingsUrl)))) {
+                    logModelPickerInteraction("disabledModelContactAdminClicked");
+                }
+                void this._openerService.open(uri, {
+                    allowCommands: true
+                });
+            },
             minWidth: 200
         };
         const previouslyFocusedElement = getActiveElement();
@@ -610,18 +728,20 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             const iconElement = renderIcon(statusIcon);
             domChildren.push(iconElement);
         }
-        domChildren.push($("span.chat-input-picker-label", undefined, name ?? ( localize(6791, "Auto"))));
+        const modelLabel = name ?? ( localize(6995, "Auto"));
+        const configDescription = this._selectedModel ? getModelConfigurationDescription(this._selectedModel, this._languageModelsService) : undefined;
+        const fullLabel = configDescription ? `${modelLabel} · ${configDescription}` : modelLabel;
+        domChildren.push($("span.chat-input-picker-label", undefined, fullLabel));
         if (this._badgeIcon) {
             domChildren.push(this._badgeIcon);
         }
         domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(this._domNode, ...domChildren);
-        const modelName = this._selectedModel?.metadata.name ?? ( localize(6791, "Auto"));
-        this._domNode.ariaLabel = ( localize(6802, "Pick Model, {0}", modelName));
+        this._domNode.ariaLabel = ( localize(7004, "Pick Model, {0}", fullLabel));
     }
 };
-ModelPickerWidget = ( __decorate([( __param(1, IActionWidgetService)), ( __param(2, ICommandService)), ( __param(3, ITelemetryService)), ( __param(4, ILanguageModelsService)), ( __param(5, IProductService)), ( __param(6, IChatEntitlementService)), ( __param(7, IUpdateService))], ModelPickerWidget));
-function getModelHoverContent(model) {
+ModelPickerWidget = ( __decorate([( __param(2, IActionWidgetService)), ( __param(3, ICommandService)), ( __param(4, IOpenerService)), ( __param(5, ITelemetryService)), ( __param(6, ILanguageModelsService)), ( __param(7, IProductService)), ( __param(8, IChatEntitlementService)), ( __param(9, IUpdateService)), ( __param(10, IUriIdentityService))], ModelPickerWidget));
+function getModelHoverContent(model, languageModelsService) {
     const isAuto = model.metadata.id === "auto" && model.metadata.vendor === "copilot";
     const markdown = ( new MarkdownString("", {
         isTrusted: true,
@@ -638,7 +758,7 @@ function getModelHoverContent(model) {
     }
     if (model.metadata.multiplier) {
         markdown.appendMarkdown(`${( localize(
-            6803,
+            7005,
             "Each chat message counts {0} toward your premium request quota",
             model.metadata.multiplier
         ))}`);
@@ -646,10 +766,28 @@ function getModelHoverContent(model) {
     }
     if (!isAuto && (model.metadata.maxInputTokens || model.metadata.maxOutputTokens)) {
         const totalTokens = (model.metadata.maxInputTokens ?? 0) + (model.metadata.maxOutputTokens ?? 0);
-        markdown.appendMarkdown(`${( localize(6804, "Context Size"))}: `);
+        markdown.appendMarkdown(`${( localize(7006, "Context Size"))}: `);
         markdown.appendMarkdown(`${formatTokenCount(totalTokens)}`);
         markdown.appendText(`\n`);
     }
+    if (languageModelsService) {
+        const schema = model.metadata.configurationSchema;
+        if (schema?.properties) {
+            const currentConfig = languageModelsService.getModelConfiguration(model.identifier) ?? {};
+            for (const [key, propSchema] of Object.entries(schema.properties)) {
+                const value = currentConfig[key] ?? propSchema.default;
+                if (value === undefined) {
+                    continue;
+                }
+                const enumItemLabels = propSchema.enumItemLabels;
+                const enumIndex = propSchema.enum?.indexOf(value) ?? -1;
+                const displayValue = enumItemLabels?.[enumIndex] ?? String(value);
+                const label = propSchema.title ?? key;
+                markdown.appendText(`${label}: ${displayValue}`);
+                markdown.appendText(`\n`);
+            }
+        }
+    }
     return markdown;
 }
 function formatTokenCount(count) {