@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPills.js

@@ -0,0 +1,282 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { addDisposableListener, EventType, getWindow, getActiveElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
+import { Action, toAction, Separator, SubmenuAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
+import { ChatChangesPillActionViewItem } from '../../../browser/chatChangesPill.js';
+import { getChatPillEntries, ChatPillsRow, ChatPillsWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/browser/chatPills';
+import { createChatSectionPill } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/browser/chatDropdownPill';
+import { SessionChatPillKind, getSessionChatPillLabel, getSessionChatPillMenu } from '../common/sessionChatPills.js';
+import { ISessionChatPillVisibilityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/sessionChatPills.service';
+import { chatArtifactPillOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatTurnPills';
+import { sessionPullRequestsPillOptions, sessionIssuesPillOptions, sessionReferencesPillOptions, sessionCustomizationsPillOptions, sessionBrowsersPillOptions, sessionSubagentsPillOptions } from './sessionChatPillOptions.js';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
+import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+
+function setsEqual(first, second) {
+    return first === second || (first.size === second.size && [...first].every(value => ( second.has(value))));
+}
+function createChatSectionPillSource(kind, action, sections, options, resourceLabels, instantiationService) {
+    return {
+        kind,
+        hasData: derived(reader => getChatPillEntries(sections.read(reader)).length > 0),
+        pill: createChatSectionPill(action, sections, options, resourceLabels, instantiationService)
+    };
+}
+let StandardChatInputPillSources = class StandardChatInputPillSources extends Disposable {
+    constructor(data, offeredKinds, instantiationService) {
+        super();
+        const offered = ( new Set(offeredKinds));
+        const resourceLabels = this._register(
+            instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER)
+        );
+        const sources = [];
+        if (data.changes && ( offered.has(SessionChatPillKind.Changes))) {
+            const changes = data.changes;
+            const action = this._register(( new Action(
+                "chatInputPills.changes",
+                changes.label.get(),
+                undefined,
+                true,
+                () => changes.open()
+            )));
+            this._register(autorun(reader => {
+                const label = changes.label.read(reader);
+                action.label = label;
+                action.tooltip = ( localize(8138, "View {0}", label));
+            }));
+            const pill = {
+                action,
+                createActionViewItem: options => ( new ChatChangesPillActionViewItem(action, options, changes.stats, instantiationService))
+            };
+            sources.push({
+                kind: SessionChatPillKind.Changes,
+                hasData: derived(reader => changes.stats.read(reader).files > 0),
+                pill: constObservable(pill),
+                getContextMenuActions: () => changes.getContextMenuActions?.() ?? []
+            });
+        }
+        const addSections = (kind, source, options) => {
+            if (!source || !( offered.has(kind))) {
+                return;
+            }
+            const action = this._register(( new Action(`chatInputPills.${kind}`, getSessionChatPillLabel(kind))));
+            const pillSource = createChatSectionPillSource(kind, action, source.sections, source.icon ? {
+                ...options,
+                icon: source.icon
+            } : options, resourceLabels, instantiationService);
+            sources.push({
+                ...pillSource,
+                hasData: source.hasData ?? pillSource.hasData,
+                isVisible: pillSource.hasData,
+                getContextMenuActions: () => source.getContextMenuActions?.() ?? [],
+                getContextMenuPrimaryActions: () => source.getContextMenuPrimaryActions?.() ?? []
+            });
+        };
+        addSections(
+            SessionChatPillKind.PullRequests,
+            data.pullRequests,
+            sessionPullRequestsPillOptions
+        );
+        addSections(SessionChatPillKind.Issues, data.issues, sessionIssuesPillOptions);
+        addSections(SessionChatPillKind.Artifacts, data.artifacts, chatArtifactPillOptions);
+        addSections(
+            SessionChatPillKind.References,
+            data.references,
+            sessionReferencesPillOptions
+        );
+        addSections(
+            SessionChatPillKind.Customizations,
+            data.customizations,
+            sessionCustomizationsPillOptions
+        );
+        addSections(SessionChatPillKind.Browsers, data.browsers, sessionBrowsersPillOptions);
+        addSections(SessionChatPillKind.Subagents, data.subagents, sessionSubagentsPillOptions);
+        this.sources = sources;
+    }
+};
+StandardChatInputPillSources = ( __decorate([( __param(2, IInstantiationService))], StandardChatInputPillSources));
+let ChatInputPills = class ChatInputPills extends Disposable {
+    constructor(
+        container,
+        _options,
+        _contextMenuService,
+        _visibility,
+        instantiationService
+    ) {
+        super();
+        this._options = _options;
+        this._contextMenuService = _contextMenuService;
+        this._visibility = _visibility;
+        this._onDidChangeVisibility = this._register(( new Emitter()));
+        this.onDidChangeVisibility = this._onDidChangeVisibility.event;
+        this._visible = false;
+        this._row = this._register(( new ChatPillsRow(_options.debugName, {
+            compact: _options.compact,
+            targetWindow: _options.targetWindow
+        })));
+        this.element = this._row.element;
+        if (container) {
+            container.appendChild(this.element);
+            this._register(toDisposable(() => this.element.remove()));
+        }
+        const visibleSources = derived(this, reader => {
+            if (!_options.enabled.read(reader)) {
+                return [];
+            }
+            return _options.sources.read(reader).filter(
+                source => source.hasData.read(reader) && (source.isVisible?.read(reader) ?? true) && (!source.kind || this._visibility.isVisible(source.kind, reader))
+            );
+        });
+        const model = {
+            pills: derived(this, reader => ( visibleSources.read(reader).map(source => source.pill.read(reader)))),
+            context: _options.context
+        };
+        this._pills = this._register(instantiationService.createInstance(ChatPillsWidget, model, {
+            ariaLabel: _options.ariaLabel,
+            actionRunner: _options.actionRunner,
+            allowContextMenu: true
+        }));
+        this._pills.element.classList.add("show-file-icons");
+        this._row.content.appendChild(this._pills.element);
+        this._row.observe(this._pills.element);
+        this._register(this._pills.onDidRemoveFocusedPill(
+            () => this._row.restoreFocus(() => this._pills.getPillElements(), _options.focusFallback)
+        ));
+        this.onDidChange = Event.any(this._row.onDidChangeLayout, this._pills.onDidChangePills);
+        const kindsWithData = derivedOpts({
+            owner: this,
+            equalsFn: setsEqual
+        }, reader => {
+            const kinds = ( new Set());
+            if (!_options.enabled.read(reader)) {
+                return kinds;
+            }
+            for (const source of _options.sources.read(reader)) {
+                if (source.kind && source.hasData.read(reader)) {
+                    kinds.add(source.kind);
+                }
+            }
+            return kinds;
+        });
+        const showContextMenu = (anchor, targetKind) => {
+            const kinds = kindsWithData.get();
+            if (kinds.size === 0) {
+                return;
+            }
+            this._contextMenuService.showContextMenu({
+                getAnchor: () => anchor,
+                getActions: () => this._getVisibilityActions(kinds, targetKind)
+            });
+        };
+        this._register(
+            addDisposableListener(this._row.content, EventType.CONTEXT_MENU, event => {
+                event.preventDefault();
+                event.stopPropagation();
+                const anchor = ( new StandardMouseEvent(getWindow(this._row.content), event));
+                showContextMenu(anchor, this._getTargetKind(event.target));
+            })
+        );
+        this._register(
+            this._row.onDidRequestContextMenu(anchor => showContextMenu(anchor, this._getTargetKind(anchor)))
+        );
+        derived(this, reader => {
+            const anyVisible = this._pills.isVisible.read(reader);
+            const anyHidden = kindsWithData.read(reader).size > 0;
+            return anyVisible ? "visible" : anyHidden ? "empty" : "hidden";
+        }).recomputeInitiallyAndOnChange(this._store, state => {
+            const activeElement = getActiveElement(this._row.content.ownerDocument);
+            const restoreInputFocus = state === "hidden" && !!activeElement && this._row.content.contains(activeElement);
+            const visible = state !== "hidden";
+            this.element.classList.toggle("hidden", !visible);
+            this._row.setEmpty(state === "empty", ( localize(8139, "Configure Session Status Pills")));
+            if (this._visible !== visible) {
+                this._visible = visible;
+                this._onDidChangeVisibility.fire(visible);
+            }
+            this._row.scanDomNode();
+            if (restoreInputFocus) {
+                this._row.restoreFocus(() => this._pills.getPillElements(), _options.focusFallback);
+            }
+        });
+    }
+    get visible() {
+        return this._visible;
+    }
+    getPillElements() {
+        return this._pills.getPillElements();
+    }
+    _getTargetKind(target) {
+        const targetPill = this._pills.getPill(target);
+        if (!targetPill) {
+            return undefined;
+        }
+        for (const source of this._options.sources.get()) {
+            if (source.kind && source.pill.get() === targetPill) {
+                return source.kind;
+            }
+        }
+        return undefined;
+    }
+    _getVisibilityActions(kindsWithData, targetKind) {
+        const menu = getSessionChatPillMenu(
+            kindsWithData,
+            this._visibility.readHiddenKinds(undefined),
+            targetKind,
+            this._options.offeredKinds
+        );
+        const restoreFocus = () => this._row.restoreFocus(() => this._pills.getPillElements());
+        const toggleAction = entry => toAction({
+            id: `chatInputPills.toggle.${entry.kind}`,
+            label: entry.label,
+            checked: entry.checked,
+            run: () => {
+                this._visibility.toggle(entry.kind);
+                restoreFocus();
+            }
+        });
+        const targetActions = [];
+        if (targetKind) {
+            for (const source of this._options.sources.get()) {
+                if (source.kind === targetKind && this._options.offeredKinds.includes(targetKind)) {
+                    targetActions.push(...(source.getContextMenuPrimaryActions?.() ?? []));
+                }
+            }
+            if (targetActions.length) {
+                targetActions.push(( new Separator()));
+            }
+        }
+        if (menu.hide) {
+            const hide = menu.hide;
+            targetActions.push(toAction({
+                id: `chatInputPills.hide.${hide.kind}`,
+                label: hide.label,
+                run: () => {
+                    this._visibility.hide(hide.kind);
+                    restoreFocus();
+                }
+            }));
+        }
+        for (const source of this._options.sources.get()) {
+            if (!source.kind || !this._options.offeredKinds.includes(source.kind) || (targetKind ? source.kind !== targetKind : !( kindsWithData.has(source.kind)))) {
+                continue;
+            }
+            const actions = source.getContextMenuActions?.();
+            if (actions?.length) {
+                targetActions.push(( new SubmenuAction(`chatInputPills.options.${source.kind}`, ( localize(8140, "{0} Options", getSessionChatPillLabel(source.kind))), actions)));
+            }
+        }
+        return Separator.join(targetActions, ( menu.withData.map(toggleAction)), ( menu.withoutData.map(toggleAction)));
+    }
+};
+ChatInputPills = ( __decorate([( __param(2, IContextMenuService)), ( __param(3, ISessionChatPillVisibilityService)), ( __param(4, IInstantiationService))], ChatInputPills));
+
+export { ChatInputPills, StandardChatInputPillSources, createChatSectionPillSource };

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

@@ -30,7 +30,7 @@ import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 
-const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(7032, "Icon for open language models settings commands.")));
+const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(8141, "Icon for open language models settings commands.")));
 const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
     ChatContextKeys.Entitlement.planFree,
     ChatContextKeys.Entitlement.planEdu,
@@ -43,7 +43,7 @@ const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContex
     ChatEntitlementContextKeys.clientByokEnabled
 ))));
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(7033, "Models Management Editor"))),
+    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(8142, "Models Management Editor"))),
     [( new SyncDescriptor(ModelsManagementEditorInput))]
 );
 class ModelsManagementEditorInputSerializer {
@@ -73,10 +73,10 @@ async function ensureChatExtensionEnabled(accessor) {
     }
     await progressService.withProgress({
         location: ProgressLocation.Window,
-        title: ( localize(7034, "Enabling AI features…"))
+        title: ( localize(8143, "Enabling AI features…"))
     }, async () => {
         await extensionsWorkbenchService.setEnablement([chatExtension], EnablementState.EnabledGlobally);
-        await extensionsWorkbenchService.updateRunningExtensions(( localize(7035, "Enabling AI features")));
+        await extensionsWorkbenchService.updateRunningExtensions(( localize(8144, "Enabling AI features")));
     });
 }
 let ChatManagementActionsContribution = class ChatManagementActionsContribution extends Disposable {
@@ -94,18 +94,22 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             constructor() {
                 super({
                     id: MANAGE_CHAT_COMMAND_ID,
-                    title: ( localize2(7036, "Manage Language Models")),
+                    title: ( localize2(8145, "Manage Language Models")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
                     f1: true
                 });
             }
-            async run(accessor) {
+            async run(accessor, searchQuery) {
                 const editorService = accessor.get(IEditorService);
                 await ensureChatExtensionEnabled(accessor);
-                return editorService.openEditor(( new ModelsManagementEditorInput()), {
+                const pane = await editorService.openEditor(( new ModelsManagementEditorInput()), {
                     pinned: true
                 });
+                if (searchQuery && pane instanceof ModelsManagementEditor) {
+                    pane.search(searchQuery);
+                }
+                return pane;
             }
         }));
         this._register(registerAction2(class extends Action2 {
@@ -118,7 +122,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
                         weight: KeybindingWeight.EditorContrib,
                         when: CONTEXT_MODELS_SEARCH_FOCUS
                     },
-                    title: ( localize2(7037, "Clear Models Search Results"))
+                    title: ( localize2(8146, "Clear Models Search Results"))
                 });
             }
             run(accessor) {
@@ -134,7 +138,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             constructor() {
                 super({
                     id: "workbench.action.openLanguageModelsJson",
-                    title: ( localize2(7038, "Open Language Models (JSON)")),
+                    title: ( localize2(8147, "Open Language Models (JSON)")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
                     icon: languageModelsOpenSettingsIcon,
@@ -164,7 +168,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
         MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
             command: {
                 id: MANAGE_CHAT_COMMAND_ID,
-                title: ( localize2(7036, "Manage Language Models")),
+                title: ( localize2(8145, "Manage Language Models")),
                 icon: languageModelsOpenSettingsIcon
             },
             when: openModelsManagementEditorWhen,

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

@@ -5,7 +5,7 @@ import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/th
 import { EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
 
-const ModelsManagementEditorIcon = registerIcon("models-management-editor-label-icon", Codicon.settings, ( localize(7039, "Icon of the Models Management editor label.")));
+const ModelsManagementEditorIcon = registerIcon("models-management-editor-label-icon", Codicon.settings, ( localize(8148, "Icon of the Models Management editor label.")));
 class ModelsManagementEditorInput extends EditorInput {
     static {
         this.ID = "workbench.input.modelsManagement";
@@ -24,7 +24,7 @@ class ModelsManagementEditorInput extends EditorInput {
         return ModelsManagementEditorInput.ID;
     }
     getName() {
-        return localize(7040, "Language Models");
+        return localize(8149, "Language Models");
     }
     getIcon() {
         return ModelsManagementEditorIcon;

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

@@ -4,6 +4,7 @@ import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ILanguageModelsProviderGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelsConfiguration";
 import Severity from "@codingame/monaco-vscode-api/vscode/vs/base/common/severity";
+import { ILanguageModelSourcePresentation } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/languageModelSourcePresentation";
 export declare const MODEL_ENTRY_TEMPLATE_ID = "model.entry.template";
 export declare const VENDOR_ENTRY_TEMPLATE_ID = "vendor.entry.template";
 export declare const GROUP_ENTRY_TEMPLATE_ID = "group.entry.template";
@@ -14,11 +15,14 @@ export declare const SEARCH_SUGGESTIONS: {
 export interface ILanguageModelProvider {
     vendor: ILanguageModelProviderDescriptor;
     group: ILanguageModelsProviderGroup;
+    sourceId?: string;
+    sourcePresentation?: ILanguageModelSourcePresentation;
 }
 export interface ILanguageModel extends ILanguageModelChatMetadataAndIdentifier {
     provider: ILanguageModelProvider;
     hidden: boolean;
 }
+export declare function getManageModelsProviderLabel(model: ILanguageModel): string;
 export interface ILanguageModelEntry {
     type: "model";
     id: string;
@@ -43,6 +47,7 @@ export interface ILanguageModelProviderEntry {
     templateId: string;
     collapsed: boolean;
     hidden: boolean;
+    sourcePresentation?: ILanguageModelSourcePresentation;
     vendorEntry: ILanguageModelProvider;
 }
 export interface IStatusEntry {

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

@@ -3,8 +3,10 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 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 { canHideModel, getLanguageModelProviderDisplayName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { languageModelSourcePresentationRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/languageModelSourcePresentation';
 
 const MODEL_ENTRY_TEMPLATE_ID = "model.entry.template";
 const VENDOR_ENTRY_TEMPLATE_ID = "vendor.entry.template";
@@ -14,6 +16,9 @@ const PROVIDER_REGEX = /@provider:\s*((".+?")|([^\s]+))/gi;
 const SEARCH_SUGGESTIONS = {
     CAPABILITIES: ["@capability:tools", "@capability:vision", "@capability:agent"]
 };
+function getManageModelsProviderLabel(model) {
+    return model.provider.group.name;
+}
 function isLanguageModelProviderEntry(entry) {
     return entry.type === "vendor";
 }
@@ -92,7 +97,9 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
     }
     doFilter() {
         const viewModelEntries = [];
-        const shouldShowGroupHeaders = this.languageModelGroups.length > 1;
+        const shouldShowGroupHeaders = this.languageModelGroups.length > 1 || ( this.languageModelGroups.some(
+            group => isLanguageModelProviderEntry(group.group) && group.group.sourcePresentation !== undefined
+        ));
         for (const group of this.languageModelGroups) {
             if (( this.collapsedGroups.has(group.group.id))) {
                 group.group.collapsed = true;
@@ -152,7 +159,7 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
         for (const modelEntry of modelEntries) {
             if (lowerProviders.length > 0) {
                 const matchesProvider = ( lowerProviders.some(
-                    provider => modelEntry.provider.vendor.vendor.toLowerCase() === provider || modelEntry.provider.vendor.displayName.toLowerCase() === provider
+                    provider => modelEntry.provider.vendor.vendor.toLowerCase() === provider || modelEntry.provider.vendor.displayName.toLowerCase() === provider || modelEntry.provider.group.vendor.toLowerCase() === provider || modelEntry.provider.group.name.toLowerCase() === provider
                 ));
                 if (!matchesProvider) {
                     continue;
@@ -237,7 +244,7 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
         const result = [];
         if (this.groupBy === ChatModelGroup.Vendor) {
             for (const model of languageModels) {
-                const groupId = this.getProviderGroupId(model.provider.group);
+                const groupId = this.getProviderGroupId(model.provider);
                 let group = result.find(group => group.group.id === groupId);
                 if (!group) {
                     group = {
@@ -249,7 +256,7 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
                 group.models.push(model);
             }
             for (const statusGroup of this.languageModelGroupStatuses) {
-                const groupId = this.getProviderGroupId(statusGroup.provider.group);
+                const groupId = this.getProviderGroupId(statusGroup.provider);
                 let group = result.find(group => group.group.id === groupId);
                 if (!group) {
                     group = {
@@ -275,6 +282,9 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
             });
         }
         for (const group of result) {
+            if (isLanguageModelProviderEntry(group.group)) {
+                group.group.hidden = group.models.length > 0 && group.models.every(model => model.hidden);
+            }
             group.models.sort((a, b) => {
                 if (a.provider.vendor.isDefault && b.provider.vendor.isDefault) {
                     return a.metadata.name.localeCompare(b.metadata.name);
@@ -295,18 +305,16 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
         return result;
     }
     createLanguageModelProviderEntry(provider) {
-        const id = this.getProviderGroupId(provider.group);
+        const id = this.getProviderGroupId(provider);
         return {
             type: "vendor",
             id,
             label: provider.group.name,
             templateId: VENDOR_ENTRY_TEMPLATE_ID,
             collapsed: ( this.collapsedGroups.has(id)),
-            hidden: this.languageModelsService.isGroupHidden(provider.group.vendor, provider.group.name),
-            vendorEntry: {
-                group: provider.group,
-                vendor: provider.vendor
-            }
+            hidden: false,
+            sourcePresentation: provider.sourcePresentation,
+            vendorEntry: provider
         };
     }
     getVendors() {
@@ -348,7 +356,7 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
         const models = [];
         const languageModelsGroups = this.languageModelsService.getLanguageModelGroups(vendor.vendor);
         for (const group of languageModelsGroups) {
-            const provider = {
+            const defaultProvider = {
                 group: group.group ?? {
                     vendor: vendor.vendor,
                     name: vendor.displayName
@@ -357,7 +365,7 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
             };
             if (group.status) {
                 this.languageModelGroupStatuses.push({
-                    provider,
+                    provider: defaultProvider,
                     status: {
                         message: group.status.message,
                         severity: group.status.severity
@@ -369,9 +377,19 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
                 if (!metadata) {
                     continue;
                 }
-                if (vendor.isDefault && metadata.id === "auto") {
+                if (!canHideModel(identifier, metadata)) {
                     continue;
                 }
+                const sourcePresentation = metadata.modelGroup?.sourceId ? languageModelSourcePresentationRegistry.get(metadata.vendor, metadata.modelGroup.sourceId) : undefined;
+                const provider = metadata.modelGroup ? {
+                    vendor,
+                    group: {
+                        vendor: metadata.modelGroup.id,
+                        name: sourcePresentation?.label ?? getLanguageModelProviderDisplayName(this.languageModelsService, metadata.modelGroup.id)
+                    },
+                    sourceId: metadata.modelGroup.sourceId,
+                    sourcePresentation
+                } : defaultProvider;
                 models.push({
                     identifier,
                     metadata,
@@ -384,7 +402,7 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
     }
     getModelsForGroup(group) {
         if (isLanguageModelProviderEntry(group)) {
-            return this.languageModels.filter(m => this.getProviderGroupId(m.provider.group) === group.id);
+            return this.languageModels.filter(m => this.getProviderGroupId(m.provider) === group.id);
         }
         return this.languageModels;
     }
@@ -392,16 +410,10 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
         this.languageModelsService.setModelHidden(entry.model.identifier, !entry.model.hidden);
     }
     toggleGroupHidden(entry) {
-        this.languageModelsService.setGroupHidden(
-            entry.vendorEntry.group.vendor,
-            entry.vendorEntry.group.name,
-            !entry.hidden
-        );
+        this.languageModelsService.setModelsHidden(( this.getModelsForGroup(entry).map(model => model.identifier)), !entry.hidden);
     }
     setModelsHidden(entries, hidden) {
-        for (const entry of entries) {
-            this.languageModelsService.setModelHidden(entry.model.identifier, hidden);
-        }
+        this.languageModelsService.setModelsHidden(( entries.map(entry => entry.model.identifier)), hidden);
     }
     refreshVisibility() {
         for (const model of this.languageModels) {
@@ -413,8 +425,8 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
     getModelId(modelEntry) {
         return `${modelEntry.provider.group.name}.${modelEntry.identifier}.${modelEntry.metadata.version}`;
     }
-    getProviderGroupId(group) {
-        return `${group.vendor}-${group.name}`;
+    getProviderGroupId(provider) {
+        return `${provider.group.vendor}-${provider.group.name}-${provider.sourceId ?? "configured"}`;
     }
     toggleCollapsed(viewModelEntry) {
         const id = isLanguageModelGroupEntry(viewModelEntry) ? viewModelEntry.id : isLanguageModelProviderEntry(viewModelEntry) ? viewModelEntry.id : undefined;
@@ -525,4 +537,4 @@ class ModelItemMatches {
     }
 }
 
-export { ChatModelGroup, ChatModelsViewModel, MODEL_ENTRY_TEMPLATE_ID, SEARCH_SUGGESTIONS, VENDOR_ENTRY_TEMPLATE_ID, isLanguageModelGroupEntry, isLanguageModelProviderEntry, isStatusEntry };
+export { ChatModelGroup, ChatModelsViewModel, MODEL_ENTRY_TEMPLATE_ID, SEARCH_SUGGESTIONS, VENDOR_ENTRY_TEMPLATE_ID, getManageModelsProviderLabel, isLanguageModelGroupEntry, isLanguageModelProviderEntry, isStatusEntry };

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

@@ -15,15 +15,15 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IDefaultAccountService } from "@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service";
 export declare function getModelHoverContent(model: ILanguageModel): MarkdownString;
 /**
  * Pure helper for building the dropdown actions shown by the **Add Models** button.
  *
- * Exposed for unit testing. When `supportsAddingModels` is false, no actions are returned
- * regardless of the other inputs so that the existing entitlement/managed-by-organization
- * restriction is preserved.
+ * Exposed for unit testing. The Copilot sign-in action is independent of whether adding
+ * configurable BYOK vendors is supported.
  */
-export declare function buildAddModelsDropdownActions(configurableVendors: ILanguageModelProviderDescriptor[], supportsAddingModels: boolean, runVendorAction: (vendor: ILanguageModelProviderDescriptor) => void | Promise<void>): IAction[];
+export declare function buildAddModelsDropdownActions(configurableVendors: ILanguageModelProviderDescriptor[], supportsAddingModels: boolean, runVendorAction: (vendor: ILanguageModelProviderDescriptor) => void | Promise<void>, runCopilotSignInAction?: () => void | Promise<void>): IAction[];
 export declare class ChatModelsWidget extends Disposable {
     private readonly languageModelsService;
     private readonly instantiationService;
@@ -37,6 +37,7 @@ export declare class ChatModelsWidget extends Disposable {
     private readonly dialogService;
     private readonly extensionsWorkbenchService;
     private readonly environmentService;
+    private readonly defaultAccountService;
     private static NUM_INSTANCES;
     readonly element: HTMLElement;
     private readonly _onDidChangeItemCount;
@@ -52,11 +53,12 @@ export declare class ChatModelsWidget extends Disposable {
     private addButtonContainer;
     private addButton;
     private dropdownActions;
+    private defaultAccountResolved;
     private viewModel;
     private delayedFiltering;
     private readonly searchFocusContextKey;
     private readonly tableDisposables;
-    constructor(languageModelsService: ILanguageModelsService, instantiationService: IInstantiationService, extensionService: IExtensionService, contextMenuService: IContextMenuService, chatEntitlementService: IChatEntitlementService, editorProgressService: IEditorProgressService, commandService: ICommandService, editorGroupsService: IEditorGroupsService, contextKeyService: IContextKeyService, dialogService: IDialogService, extensionsWorkbenchService: IExtensionsWorkbenchService, environmentService: IWorkbenchEnvironmentService);
+    constructor(languageModelsService: ILanguageModelsService, instantiationService: IInstantiationService, extensionService: IExtensionService, contextMenuService: IContextMenuService, chatEntitlementService: IChatEntitlementService, editorProgressService: IEditorProgressService, commandService: ICommandService, editorGroupsService: IEditorGroupsService, contextKeyService: IContextKeyService, dialogService: IDialogService, extensionsWorkbenchService: IExtensionsWorkbenchService, environmentService: IWorkbenchEnvironmentService, defaultAccountService: IDefaultAccountService);
     private create;
     private createTable;
     private updateAddModelsButton;