@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -1,69 +1,68 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { distinct, coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { distinct } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { or, matchesBaseContiguousSubString, matchesWords, matchesCamelCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
-var ChatModelsViewModel_1;
-const MODEL_ENTRY_TEMPLATE_ID = 'model.entry.template';
-const VENDOR_ENTRY_TEMPLATE_ID = 'vendor.entry.template';
-const GROUP_ENTRY_TEMPLATE_ID = 'group.entry.template';
+const MODEL_ENTRY_TEMPLATE_ID = "model.entry.template";
+const VENDOR_ENTRY_TEMPLATE_ID = "vendor.entry.template";
+const GROUP_ENTRY_TEMPLATE_ID = "group.entry.template";
 const wordFilter = or(matchesBaseContiguousSubString, matchesWords);
 const CAPABILITY_REGEX = /@capability:\s*([^\s]+)/gi;
 const VISIBLE_REGEX = /@visible:\s*(true|false)/i;
 const PROVIDER_REGEX = /@provider:\s*((".+?")|([^\s]+))/gi;
 const SEARCH_SUGGESTIONS = {
-    CAPABILITIES: [
-        '@capability:tools',
-        '@capability:vision',
-        '@capability:agent'
-    ],
-    VISIBILITY: [
-        '@visible:true',
-        '@visible:false'
-    ]
+    CAPABILITIES: ["@capability:tools", "@capability:vision", "@capability:agent"],
+    VISIBILITY: ["@visible:true", "@visible:false"]
 };
-function isVendorEntry(entry) {
-    return entry.type === 'vendor';
+function isLanguageModelProviderEntry(entry) {
+    return entry.type === "vendor";
 }
-function isGroupEntry(entry) {
-    return entry.type === 'group';
+function isLanguageModelGroupEntry(entry) {
+    return entry.type === "group";
+}
+function isStatusEntry(entry) {
+    return entry.type === "status";
 }
 var ChatModelGroup;
-(function (ChatModelGroup) {
+(function(ChatModelGroup) {
     ChatModelGroup["Vendor"] = "vendor";
     ChatModelGroup["Visibility"] = "visibility";
 })(ChatModelGroup || (ChatModelGroup = {}));
-let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel extends Disposable {
-    get groupBy() { return this._groupBy; }
+let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
+    get groupBy() {
+        return this._groupBy;
+    }
     set groupBy(groupBy) {
         if (this._groupBy !== groupBy) {
             this._groupBy = groupBy;
             this.collapsedGroups.clear();
-            this.modelEntries = this.sortModels(this.modelEntries);
-            this.filter(this.searchValue);
+            this.languageModelGroups = this.groupModels(this.languageModels);
+            this.doFilter();
             this._onDidChangeGrouping.fire(groupBy);
         }
     }
-    constructor(languageModelsService, chatEntitlementService) {
+    constructor(languageModelsService) {
         super();
         this.languageModelsService = languageModelsService;
-        this.chatEntitlementService = chatEntitlementService;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._onDidChangeGrouping = this._register(( new Emitter()));
         this.onDidChangeGrouping = this._onDidChangeGrouping.event;
+        this.languageModelGroupStatuses = [];
+        this.languageModelGroups = [];
         this.collapsedGroups = ( new Set());
-        this.searchValue = '';
+        this.searchValue = "";
         this.modelsSorted = false;
         this._groupBy = ChatModelGroup.Vendor;
         this._viewModelEntries = [];
-        this.modelEntries = [];
-        this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.refresh()));
+        this.languageModels = [];
+        this._register(
+            this.languageModelsService.onDidChangeLanguageModels(vendor => this.refreshVendor(vendor))
+        );
     }
     get viewModelEntries() {
         return this._viewModelEntries;
@@ -73,26 +72,58 @@ let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel exte
         if (this.selectedEntry) {
             this.selectedEntry = this._viewModelEntries.find(entry => entry.id === this.selectedEntry?.id);
         }
-        this._onDidChange.fire({ at, removed, added });
+        this._onDidChange.fire({
+            at,
+            removed,
+            added
+        });
     }
     shouldRefilter() {
         return !this.modelsSorted;
     }
     filter(searchValue) {
-        this.searchValue = searchValue;
-        if (!this.modelsSorted) {
-            this.modelEntries = this.sortModels(this.modelEntries);
+        if (searchValue !== this.searchValue) {
+            this.searchValue = searchValue;
+            this.collapsedGroups.clear();
+            if (!this.modelsSorted) {
+                this.languageModelGroups = this.groupModels(this.languageModels);
+            }
+            this.doFilter();
         }
-        const filtered = this.filterModels(this.modelEntries, searchValue);
-        this.splice(0, this._viewModelEntries.length, filtered);
         return this.viewModelEntries;
     }
+    doFilter() {
+        const viewModelEntries = [];
+        const shouldShowGroupHeaders = this.languageModelGroups.length > 1;
+        for (const group of this.languageModelGroups) {
+            if (( this.collapsedGroups.has(group.group.id))) {
+                group.group.collapsed = true;
+                if (shouldShowGroupHeaders) {
+                    viewModelEntries.push(group.group);
+                }
+                continue;
+            }
+            const groupEntries = [];
+            if (group.status) {
+                groupEntries.push(group.status);
+            }
+            groupEntries.push(...this.filterModels(group.models, this.searchValue));
+            if (groupEntries.length > 0) {
+                group.group.collapsed = false;
+                if (shouldShowGroupHeaders) {
+                    viewModelEntries.push(group.group);
+                }
+                viewModelEntries.push(...groupEntries);
+            }
+        }
+        this.splice(0, this._viewModelEntries.length, viewModelEntries);
+    }
     filterModels(modelEntries, searchValue) {
         let visible;
         const visibleMatches = VISIBLE_REGEX.exec(searchValue);
         if (visibleMatches && visibleMatches[1]) {
-            visible = visibleMatches[1].toLowerCase() === 'true';
-            searchValue = searchValue.replace(VISIBLE_REGEX, '');
+            visible = visibleMatches[1].toLowerCase() === "true";
+            searchValue = searchValue.replace(VISIBLE_REGEX, "");
         }
         const providerNames = [];
         let providerMatch;
@@ -102,7 +133,7 @@ let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel exte
             providerNames.push(providerName);
         }
         if (providerNames.length > 0) {
-            searchValue = searchValue.replace(PROVIDER_REGEX, '');
+            searchValue = searchValue.replace(PROVIDER_REGEX, "");
         }
         const capabilities = [];
         let capabilityMatch;
@@ -111,10 +142,10 @@ let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel exte
             capabilities.push(capabilityMatch[1].toLowerCase());
         }
         if (capabilities.length > 0) {
-            searchValue = searchValue.replace(CAPABILITY_REGEX, '');
+            searchValue = searchValue.replace(CAPABILITY_REGEX, "");
         }
-        const quoteAtFirstChar = searchValue.charAt(0) === '"';
-        const quoteAtLastChar = searchValue.charAt(searchValue.length - 1) === '"';
+        const quoteAtFirstChar = searchValue.charAt(0) === "\"";
+        const quoteAtLastChar = searchValue.charAt(searchValue.length - 1) === "\"";
         const completeMatch = quoteAtFirstChar && quoteAtLastChar;
         if (quoteAtFirstChar) {
             searchValue = searchValue.substring(1);
@@ -123,22 +154,19 @@ let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel exte
             searchValue = searchValue.substring(0, searchValue.length - 1);
         }
         searchValue = searchValue.trim();
-        const isFiltering = searchValue !== '' || capabilities.length > 0 || providerNames.length > 0 || visible !== undefined;
         const result = [];
-        const words = searchValue.split(' ');
-        const allVendors = ( new Set(( this.modelEntries.map(m => m.vendor))));
-        const showHeaders = allVendors.size > 1;
-        const addedGroups = ( new Set());
+        const words = searchValue.split(" ");
         const lowerProviders = ( providerNames.map(p => p.toLowerCase().trim()));
         for (const modelEntry of modelEntries) {
             if (visible !== undefined) {
-                if ((modelEntry.metadata.isUserSelectable ?? false) !== visible) {
+                if (modelEntry.visible !== visible) {
                     continue;
                 }
             }
             if (lowerProviders.length > 0) {
-                const matchesProvider = ( lowerProviders.some(provider => modelEntry.vendor.toLowerCase() === provider ||
-                    modelEntry.vendorDisplayName.toLowerCase() === provider));
+                const matchesProvider = ( lowerProviders.some(
+                    provider => modelEntry.provider.vendor.vendor.toLowerCase() === provider || modelEntry.provider.vendor.displayName.toLowerCase() === provider
+                ));
                 if (!matchesProvider) {
                     continue;
                 }
@@ -169,58 +197,16 @@ let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel exte
                     continue;
                 }
             }
-            if (this.groupBy === ChatModelGroup.Vendor) {
-                if (showHeaders) {
-                    if (!( addedGroups.has(modelEntry.vendor))) {
-                        const isCollapsed = !isFiltering && ( this.collapsedGroups.has(modelEntry.vendor));
-                        const vendorInfo = this.languageModelsService.getVendors().find(v => v.vendor === modelEntry.vendor);
-                        result.push({
-                            type: 'vendor',
-                            id: `vendor-${modelEntry.vendor}`,
-                            vendorEntry: {
-                                vendor: modelEntry.vendor,
-                                vendorDisplayName: modelEntry.vendorDisplayName,
-                                managementCommand: vendorInfo?.managementCommand
-                            },
-                            templateId: VENDOR_ENTRY_TEMPLATE_ID,
-                            collapsed: isCollapsed
-                        });
-                        addedGroups.add(modelEntry.vendor);
-                    }
-                    if (!isFiltering && ( this.collapsedGroups.has(modelEntry.vendor))) {
-                        continue;
-                    }
-                }
-            }
-            else if (this.groupBy === ChatModelGroup.Visibility) {
-                const isVisible = modelEntry.metadata.isUserSelectable ?? false;
-                const groupKey = isVisible ? 'visible' : 'hidden';
-                if (!( addedGroups.has(groupKey))) {
-                    const isCollapsed = !isFiltering && ( this.collapsedGroups.has(groupKey));
-                    result.push({
-                        type: 'group',
-                        id: `group-${groupKey}`,
-                        group: groupKey,
-                        label: isVisible ? ( localize(5203, "Visible")) : ( localize(5204, "Hidden")),
-                        templateId: GROUP_ENTRY_TEMPLATE_ID,
-                        collapsed: isCollapsed
-                    });
-                    addedGroups.add(groupKey);
-                }
-                if (!isFiltering && ( this.collapsedGroups.has(groupKey))) {
-                    continue;
-                }
-            }
-            const modelId = ChatModelsViewModel_1.getId(modelEntry);
+            const modelId = this.getModelId(modelEntry);
             result.push({
-                type: 'model',
+                type: "model",
                 id: modelId,
                 templateId: MODEL_ENTRY_TEMPLATE_ID,
-                modelEntry,
+                model: modelEntry,
                 modelNameMatches: modelMatches?.modelNameMatches || undefined,
                 modelIdMatches: modelMatches?.modelIdMatches || undefined,
                 providerMatches: modelMatches?.providerMatches || undefined,
-                capabilityMatches: matchedCapabilities.length ? matchedCapabilities : undefined,
+                capabilityMatches: matchedCapabilities.length ? matchedCapabilities : undefined
             });
         }
         return result;
@@ -231,137 +217,261 @@ let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel exte
             return matchedCapabilities;
         }
         switch (capability) {
-            case 'tools':
-            case 'toolcalling':
-                if (modelEntry.metadata.capabilities.toolCalling === true) {
-                    matchedCapabilities.push('toolCalling');
-                }
-                break;
-            case 'vision':
-                if (modelEntry.metadata.capabilities.vision === true) {
-                    matchedCapabilities.push('vision');
-                }
-                break;
-            case 'agent':
-            case 'agentmode':
-                if (modelEntry.metadata.capabilities.agentMode === true) {
-                    matchedCapabilities.push('agentMode');
-                }
-                break;
-            default:
-                if (modelEntry.metadata.capabilities.editTools) {
-                    for (const tool of modelEntry.metadata.capabilities.editTools) {
-                        if (tool.toLowerCase().includes(capability)) {
-                            matchedCapabilities.push(tool);
-                        }
+        case "tools":
+        case "toolcalling":
+            if (modelEntry.metadata.capabilities.toolCalling === true) {
+                matchedCapabilities.push("toolCalling");
+            }
+            break;
+        case "vision":
+            if (modelEntry.metadata.capabilities.vision === true) {
+                matchedCapabilities.push("vision");
+            }
+            break;
+        case "agent":
+        case "agentmode":
+            if (modelEntry.metadata.capabilities.agentMode === true) {
+                matchedCapabilities.push("agentMode");
+            }
+            break;
+        default:
+            if (modelEntry.metadata.capabilities.editTools) {
+                for (const tool of modelEntry.metadata.capabilities.editTools) {
+                    if (tool.toLowerCase().includes(capability)) {
+                        matchedCapabilities.push(tool);
                     }
                 }
-                break;
+            }
+            break;
         }
         return matchedCapabilities;
     }
-    sortModels(modelEntries) {
+    groupModels(languageModels) {
+        const result = [];
         if (this.groupBy === ChatModelGroup.Visibility) {
-            modelEntries.sort((a, b) => {
-                const aVisible = a.metadata.isUserSelectable ?? false;
-                const bVisible = b.metadata.isUserSelectable ?? false;
-                if (aVisible === bVisible) {
-                    if (a.vendor === b.vendor) {
-                        return a.metadata.name.localeCompare(b.metadata.name);
-                    }
-                    if (a.vendor === 'copilot') {
-                        return -1;
-                    }
-                    if (b.vendor === 'copilot') {
-                        return 1;
-                    }
-                    return a.vendorDisplayName.localeCompare(b.vendorDisplayName);
+            const visible = [], hidden = [];
+            for (const model of languageModels) {
+                if (model.visible) {
+                    visible.push(model);
+                } else {
+                    hidden.push(model);
+                }
+            }
+            result.push({
+                group: {
+                    type: "group",
+                    id: "visible",
+                    label: ( localize(5371, "Visible")),
+                    templateId: GROUP_ENTRY_TEMPLATE_ID,
+                    collapsed: ( this.collapsedGroups.has("visible"))
+                },
+                models: visible
+            });
+            result.push({
+                group: {
+                    type: "group",
+                    id: "hidden",
+                    label: ( localize(5372, "Hidden")),
+                    templateId: GROUP_ENTRY_TEMPLATE_ID,
+                    collapsed: ( this.collapsedGroups.has("hidden"))
+                },
+                models: hidden
+            });
+        } else if (this.groupBy === ChatModelGroup.Vendor) {
+            for (const model of languageModels) {
+                const groupId = this.getProviderGroupId(model.provider.group);
+                let group = result.find(group => group.group.id === groupId);
+                if (!group) {
+                    group = {
+                        group: this.createLanguageModelProviderEntry(model.provider),
+                        models: []
+                    };
+                    result.push(group);
                 }
-                return aVisible ? -1 : 1;
+                group.models.push(model);
+            }
+            for (const statusGroup of this.languageModelGroupStatuses) {
+                const groupId = this.getProviderGroupId(statusGroup.provider.group);
+                let group = result.find(group => group.group.id === groupId);
+                if (!group) {
+                    group = {
+                        group: this.createLanguageModelProviderEntry(statusGroup.provider),
+                        models: []
+                    };
+                    result.push(group);
+                }
+                group.status = {
+                    id: `status.${group.group.id}`,
+                    type: "status",
+                    ...statusGroup.status
+                };
+            }
+            result.sort((a, b) => {
+                if (a.models[0]?.provider.vendor.isDefault) {
+                    return -1;
+                }
+                if (b.models[0]?.provider.vendor.isDefault) {
+                    return 1;
+                }
+                return a.group.label.localeCompare(b.group.label);
             });
         }
-        else if (this.groupBy === ChatModelGroup.Vendor) {
-            modelEntries.sort((a, b) => {
-                if (a.vendor === b.vendor) {
+        for (const group of result) {
+            group.models.sort((a, b) => {
+                if (a.provider.vendor.isDefault && b.provider.vendor.isDefault) {
                     return a.metadata.name.localeCompare(b.metadata.name);
                 }
-                if (a.vendor === 'copilot') {
+                if (a.provider.vendor.isDefault) {
                     return -1;
                 }
-                if (b.vendor === 'copilot') {
+                if (b.provider.vendor.isDefault) {
                     return 1;
                 }
-                return a.vendorDisplayName.localeCompare(b.vendorDisplayName);
+                if (a.provider.group.name === b.provider.group.name) {
+                    return a.metadata.name.localeCompare(b.metadata.name);
+                }
+                return a.provider.group.name.localeCompare(b.provider.group.name);
             });
         }
         this.modelsSorted = true;
-        return modelEntries;
+        return result;
+    }
+    createLanguageModelProviderEntry(provider) {
+        const id = this.getProviderGroupId(provider.group);
+        return {
+            type: "vendor",
+            id,
+            label: provider.group.name,
+            templateId: VENDOR_ENTRY_TEMPLATE_ID,
+            collapsed: ( this.collapsedGroups.has(id)),
+            vendorEntry: {
+                group: provider.group,
+                vendor: provider.vendor
+            }
+        };
     }
     getVendors() {
         return [...this.languageModelsService.getVendors()].sort((a, b) => {
-            if (a.vendor === 'copilot') {
+            if (a.isDefault) {
                 return -1;
             }
-            if (b.vendor === 'copilot') {
+            if (b.isDefault) {
                 return 1;
             }
             return a.displayName.localeCompare(b.displayName);
         });
     }
     async refresh() {
-        this.modelEntries = [];
+        await this.languageModelsService.selectLanguageModels({});
+        await this.refreshAllVendors();
+    }
+    async refreshAllVendors() {
+        this.languageModels = [];
+        this.languageModelGroupStatuses = [];
         for (const vendor of this.getVendors()) {
-            const modelIdentifiers = await this.languageModelsService.selectLanguageModels({ vendor: vendor.vendor }, vendor.vendor === 'copilot');
-            const models = coalesce(( modelIdentifiers.map(identifier => {
+            this.addVendorModels(vendor);
+        }
+        this.languageModelGroups = this.groupModels(this.languageModels);
+        this.doFilter();
+    }
+    refreshVendor(vendorId) {
+        const vendor = this.getVendors().find(v => v.vendor === vendorId);
+        if (!vendor) {
+            return;
+        }
+        this.languageModels = this.languageModels.filter(m => m.provider.vendor.vendor !== vendorId);
+        this.languageModelGroupStatuses = this.languageModelGroupStatuses.filter(s => s.provider.vendor.vendor !== vendorId);
+        this.addVendorModels(vendor);
+        this.languageModelGroups = this.groupModels(this.languageModels);
+        this.doFilter();
+    }
+    addVendorModels(vendor) {
+        const models = [];
+        const languageModelsGroups = this.languageModelsService.getLanguageModelGroups(vendor.vendor);
+        for (const group of languageModelsGroups) {
+            const provider = {
+                group: group.group ?? {
+                    vendor: vendor.vendor,
+                    name: vendor.displayName
+                },
+                vendor
+            };
+            if (group.status) {
+                this.languageModelGroupStatuses.push({
+                    provider,
+                    status: {
+                        message: group.status.message,
+                        severity: group.status.severity
+                    }
+                });
+            }
+            for (const identifier of group.modelIdentifiers) {
                 const metadata = this.languageModelsService.lookupLanguageModel(identifier);
                 if (!metadata) {
-                    return undefined;
+                    continue;
                 }
-                if (vendor.vendor === 'copilot' && metadata.id === 'auto') {
-                    return undefined;
+                if (vendor.isDefault && metadata.id === "auto") {
+                    continue;
                 }
-                return {
-                    vendor: vendor.vendor,
-                    vendorDisplayName: vendor.displayName,
+                models.push({
                     identifier,
-                    metadata
-                };
-            })));
-            this.modelEntries.push(...models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name)));
-            const modelEntries = distinct(this.modelEntries, modelEntry => ChatModelsViewModel_1.getId(modelEntry));
-            if (this._groupBy === ChatModelGroup.Visibility) {
-                this.modelEntries = this.sortModels(modelEntries);
-            }
-            else {
-                this.modelEntries = modelEntries;
-                if (models.every(m => !m.metadata.isUserSelectable)) {
-                    this.collapsedGroups.add(vendor.vendor);
-                }
+                    metadata,
+                    provider,
+                    visible: metadata.isUserSelectable ?? false
+                });
             }
-            this.modelEntries = this._groupBy === ChatModelGroup.Visibility ? this.sortModels(modelEntries) : modelEntries;
-            this.filter(this.searchValue);
         }
+        this.languageModels.push(...models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name)));
     }
     toggleVisibility(model) {
-        const isVisible = model.modelEntry.metadata.isUserSelectable ?? false;
-        const newVisibility = !isVisible;
-        this.languageModelsService.updateModelPickerPreference(model.modelEntry.identifier, newVisibility);
-        const metadata = this.languageModelsService.lookupLanguageModel(model.modelEntry.identifier);
+        const newVisibility = !model.model.visible;
+        this.languageModelsService.updateModelPickerPreference(model.model.identifier, newVisibility);
+        const metadata = this.languageModelsService.lookupLanguageModel(model.model.identifier);
         const index = this.viewModelEntries.indexOf(model);
         if (metadata && index !== -1) {
-            model.id = ChatModelsViewModel_1.getId(model.modelEntry);
-            model.modelEntry.metadata = metadata;
+            model.model.visible = newVisibility;
+            model.model.metadata = metadata;
+            model.id = this.getModelId(model.model);
             if (this.groupBy === ChatModelGroup.Visibility) {
                 this.modelsSorted = false;
             }
             this.splice(index, 1, [model]);
         }
     }
-    static getId(modelEntry) {
-        return `${modelEntry.identifier}.${modelEntry.metadata.version}-visible:${modelEntry.metadata.isUserSelectable}`;
+    setModelsVisibility(models, visible) {
+        for (const model of models) {
+            this.languageModelsService.updateModelPickerPreference(model.model.identifier, visible);
+            model.model.visible = visible;
+        }
+        this.languageModelGroups = this.groupModels(this.languageModels);
+        this.doFilter();
+    }
+    setGroupVisibility(group, visible) {
+        const models = this.getModelsForGroup(group);
+        for (const model of models) {
+            this.languageModelsService.updateModelPickerPreference(model.identifier, visible);
+            model.visible = visible;
+        }
+        this.languageModelGroups = this.groupModels(this.languageModels);
+        this.doFilter();
+    }
+    getModelsForGroup(group) {
+        if (isLanguageModelProviderEntry(group)) {
+            return this.languageModels.filter(m => this.getProviderGroupId(m.provider.group) === group.id);
+        } else {
+            return this.languageModels.filter(
+                m => (group.id === "visible" && m.visible) || (group.id === "hidden" && !m.visible)
+            );
+        }
+    }
+    getModelId(modelEntry) {
+        return `${modelEntry.provider.group.name}.${modelEntry.identifier}.${modelEntry.metadata.version}-visible:${modelEntry.visible}`;
+    }
+    getProviderGroupId(group) {
+        return `${group.vendor}-${group.name}`;
     }
     toggleCollapsed(viewModelEntry) {
-        const id = isGroupEntry(viewModelEntry) ? viewModelEntry.group : isVendorEntry(viewModelEntry) ? viewModelEntry.vendorEntry.vendor : undefined;
+        const id = isLanguageModelGroupEntry(viewModelEntry) ? viewModelEntry.id : isLanguageModelProviderEntry(viewModelEntry) ? viewModelEntry.id : undefined;
         if (!id) {
             return;
         }
@@ -369,44 +479,30 @@ let ChatModelsViewModel = ChatModelsViewModel_1 = class ChatModelsViewModel exte
         if (!this.collapsedGroups.delete(id)) {
             this.collapsedGroups.add(id);
         }
-        this.filter(this.searchValue);
+        this.doFilter();
     }
     collapseAll() {
-        const allGroupIds = ( new Set());
+        this.collapsedGroups.clear();
         for (const entry of this.viewModelEntries) {
-            if (isVendorEntry(entry)) {
-                allGroupIds.add(entry.vendorEntry.vendor);
+            if (isLanguageModelProviderEntry(entry) || isLanguageModelGroupEntry(entry)) {
+                this.collapsedGroups.add(entry.id);
             }
-            else if (isGroupEntry(entry)) {
-                allGroupIds.add(entry.group);
-            }
-        }
-        for (const id of allGroupIds) {
-            this.collapsedGroups.add(id);
         }
-        this.filter(this.searchValue);
+        this.doFilter();
     }
     getConfiguredVendors() {
         const result = [];
         const seenVendors = ( new Set());
-        for (const modelEntry of this.modelEntries) {
-            if (!( seenVendors.has(modelEntry.vendor))) {
-                seenVendors.add(modelEntry.vendor);
-                const vendorInfo = this.languageModelsService.getVendors().find(v => v.vendor === modelEntry.vendor);
-                result.push({
-                    vendor: modelEntry.vendor,
-                    vendorDisplayName: modelEntry.vendorDisplayName,
-                    managementCommand: vendorInfo?.managementCommand
-                });
+        for (const modelEntry of this.languageModels) {
+            if (!( seenVendors.has(modelEntry.provider.group.name))) {
+                seenVendors.add(modelEntry.provider.group.name);
+                result.push(modelEntry.provider);
             }
         }
         return result;
     }
 };
-ChatModelsViewModel = ChatModelsViewModel_1 = ( __decorate([
-    ( __param(0, ILanguageModelsService)),
-    ( __param(1, IChatEntitlementService))
-], ChatModelsViewModel));
+ChatModelsViewModel = ( __decorate([( __param(0, ILanguageModelsService))], ChatModelsViewModel));
 class ModelItemMatches {
     constructor(modelEntry, searchValue, words, completeMatch) {
         this.modelNameMatches = null;
@@ -414,26 +510,39 @@ class ModelItemMatches {
         this.providerMatches = null;
         this.capabilityMatches = null;
         if (!completeMatch) {
-            this.modelNameMatches = modelEntry.metadata.name ?
-                this.matches(searchValue, modelEntry.metadata.name, (word, wordToMatchAgainst) => matchesWords(word, wordToMatchAgainst, true), words) :
-                null;
-            this.modelIdMatches = this.matches(searchValue, modelEntry.identifier, or(matchesWords, matchesCamelCase), words);
-            this.providerMatches = this.matches(searchValue, modelEntry.vendorDisplayName, (word, wordToMatchAgainst) => matchesWords(word, wordToMatchAgainst, true), words);
+            this.modelNameMatches = modelEntry.metadata.name ? this.matches(
+                searchValue,
+                modelEntry.metadata.name,
+                (word, wordToMatchAgainst) => matchesWords(word, wordToMatchAgainst, true),
+                words
+            ) : null;
+            this.modelIdMatches = this.matches(
+                searchValue,
+                modelEntry.metadata.id,
+                or(matchesWords, matchesCamelCase),
+                words
+            );
+            this.providerMatches = this.matches(
+                searchValue,
+                modelEntry.provider.group.name,
+                (word, wordToMatchAgainst) => matchesWords(word, wordToMatchAgainst, true),
+                words
+            );
             if (modelEntry.metadata.capabilities) {
                 const capabilityStrings = [];
                 if (modelEntry.metadata.capabilities.toolCalling) {
-                    capabilityStrings.push('tools', 'toolCalling');
+                    capabilityStrings.push("tools", "toolCalling");
                 }
                 if (modelEntry.metadata.capabilities.vision) {
-                    capabilityStrings.push('vision');
+                    capabilityStrings.push("vision");
                 }
                 if (modelEntry.metadata.capabilities.agentMode) {
-                    capabilityStrings.push('agent', 'agentMode');
+                    capabilityStrings.push("agent", "agentMode");
                 }
                 if (modelEntry.metadata.capabilities.editTools) {
                     capabilityStrings.push(...modelEntry.metadata.capabilities.editTools);
                 }
-                const capabilityString = capabilityStrings.join(' ');
+                const capabilityString = capabilityStrings.join(" ");
                 if (capabilityString) {
                     this.capabilityMatches = this.matches(searchValue, capabilityString, or(matchesWords, matchesCamelCase), words);
                 }
@@ -456,8 +565,7 @@ class ModelItemMatches {
             const wordMatches = wordMatchesFilter(word, wordToMatchAgainst);
             if (wordMatches) {
                 matches = [...(matches || []), ...wordMatches];
-            }
-            else {
+            } else {
                 matches = null;
                 break;
             }
@@ -465,12 +573,10 @@ class ModelItemMatches {
         return matches;
     }
     filterAndSort(matches) {
-        return distinct(matches, (a => a.start + '.' + a.end))
-            .filter(match => !( matches.some(
+        return distinct(matches, (a => a.start + "." + a.end)).filter(match => !( matches.some(
             m => !(m.start === match.start && m.end === match.end) && (m.start <= match.start && m.end >= match.end)
-        )))
-            .sort((a, b) => a.start - b.start);
+        ))).sort((a, b) => a.start - b.start);
     }
 }
 
-export { ChatModelGroup, ChatModelsViewModel, GROUP_ENTRY_TEMPLATE_ID, MODEL_ENTRY_TEMPLATE_ID, SEARCH_SUGGESTIONS, VENDOR_ENTRY_TEMPLATE_ID, isGroupEntry, isVendorEntry };
+export { ChatModelGroup, ChatModelsViewModel, GROUP_ENTRY_TEMPLATE_ID, MODEL_ENTRY_TEMPLATE_ID, SEARCH_SUGGESTIONS, VENDOR_ENTRY_TEMPLATE_ID, isLanguageModelGroupEntry, isLanguageModelProviderEntry, isStatusEntry };