LLM inference in C/C++
C++ ggml
ui: Improve Chat Form Actions UI/UX (models selector, add panel) (#27746)
Aleksander Grygiercae63579b67a
diff --git a/tools/ui/src/lib/components/app/badges/BadgesModality.svelte b/tools/ui/src/lib/components/app/badges/BadgesModality.svelteindex 4eb3e7838d..83b1b46aff 100644--- a/tools/ui/src/lib/components/app/badges/BadgesModality.svelte+++ b/tools/ui/src/lib/components/app/badges/BadgesModality.svelte@@ -1,5 +1,5 @@<script lang="ts">- import { Eye, Mic, Video } from '@lucide/svelte';+ import { MODALITY_ICONS, MODALITY_LABELS } from '$lib/constants';import { ModelModality } from '$lib/enums';interface Props {@@ -8,29 +8,22 @@}let { class: className = '', modalities }: Props = $props();-</script>-{#each modalities as modality (modality)}- {#if modality === ModelModality.VISION || modality === ModelModality.AUDIO || modality === ModelModality.VIDEO}- <span- class={[- 'inline-flex items-center gap-1 rounded-md bg-muted px-2 py-1 text-xs font-medium',- className- ]}- >- {#if modality === ModelModality.VISION}- <Eye class="h-3 w-3" />+ const shownModalities = [ModelModality.VISION, ModelModality.AUDIO, ModelModality.VIDEO] as const;- Vision (Image)- {:else if modality === ModelModality.VIDEO}- <Video class="h-3 w-3" />+ let visible = $derived(shownModalities.filter((modality) => modalities.includes(modality)));+</script>- Vision (Video)- {:else}- <Mic class="h-3 w-3" />+{#each visible as modality (modality)}+ {@const ModalityIcon = MODALITY_ICONS[modality]}+ <span+ class={[+ 'inline-flex items-center gap-1 rounded-md bg-muted px-2 py-1 text-xs font-medium',+ className+ ]}+ >+ <ModalityIcon class="h-3 w-3" />- Audio- {/if}- </span>- {/if}+ {MODALITY_LABELS[modality]}+ </span>{/each}diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddDropdown.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddDropdown.svelteindex 61f816affa..9c3a9e8912 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddDropdown.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddDropdown.svelte@@ -1,5 +1,5 @@<script lang="ts">- import { File, MessageSquare, Plus } from '@lucide/svelte';+ import { File, Image, MessageSquare, Mic, Plus, Video } from '@lucide/svelte';import { ChatFormActionAddToolsSubmenu, McpLogo } from '$lib/components/app';import { buttonVariants } from '$lib/components/ui/button';import * as DropdownMenu from '$lib/components/ui/dropdown-menu';@@ -8,10 +8,10 @@import {ATTACHMENT_FILE_ITEMS,ATTACHMENT_TOOLTIP_TEXT,- ICON_CLASS_DEFAULT,- TOOLTIP_DELAY_DURATION+ ICON_CLASS_DEFAULT} from '$lib/constants';import { getChatFormActionsContext } from '$lib/contexts';+ import { AttachmentAction, AttachmentItemEnabledWhen } from '$lib/enums';import { useAttachmentMenu } from '$lib/hooks/use-attachment-menu.svelte';interface Props {@@ -41,6 +41,18 @@dropdownOpen = false;});++ const FILE_MODALITY_ICONS: Record<string, { icon: typeof Image; label: string }> = {+ [AttachmentItemEnabledWhen.HAS_AUDIO_MODALITY]: { icon: Mic, label: 'Audio' },+ [AttachmentItemEnabledWhen.HAS_VIDEO_MODALITY]: { icon: Video, label: 'Video' },+ [AttachmentItemEnabledWhen.HAS_VISION_MODALITY]: { icon: Image, label: 'Vision' }+ };++ const supportedModalities = $derived.by(() =>+ ATTACHMENT_FILE_ITEMS.filter((item) => attachmentMenu.isItemEnabled(item.enabledWhen))+ .map((item) => FILE_MODALITY_ICONS[item.enabledWhen ?? ''])+ .filter((modality) => modality !== undefined)+ );</script><div class="flex items-center gap-1 {className}">@@ -80,50 +92,32 @@}}}>- <DropdownMenu.Sub>- <DropdownMenu.SubTrigger class="flex cursor-pointer items-center gap-2">- <File class={ICON_CLASS_DEFAULT} />+ <DropdownMenu.Item+ class="flex cursor-pointer items-center gap-2"+ onclick={() => attachmentMenu.callbacks[AttachmentAction.FILE_UPLOAD]()}+ >+ <File class={ICON_CLASS_DEFAULT} />+ <span class="flex min-w-0 items-center gap-2"><span>Add files</span>- </DropdownMenu.SubTrigger>-- <DropdownMenu.SubContent class="w-48">- {#each ATTACHMENT_FILE_ITEMS as item (item.id)}- {@const enabled = attachmentMenu.isItemEnabled(item.enabledWhen)}- {#if enabled}- <DropdownMenu.Item- class="{item.class ?? ''} flex cursor-pointer items-center gap-2"- onclick={() => attachmentMenu.callbacks[item.action]()}- >- <item.icon class={ICON_CLASS_DEFAULT} />-- <span>{item.label}</span>- </DropdownMenu.Item>- {:else if item.disabledTooltip}- <Tooltip.Root delayDuration={TOOLTIP_DELAY_DURATION}>- <Tooltip.Trigger tabindex={-1}>- {#snippet child({ props })}- <div {...props} class="cursor-default">- <DropdownMenu.Item- class="{item.class ?? ''} flex items-center gap-2"- disabled- >- <item.icon class={ICON_CLASS_DEFAULT} />-- <span>{item.label}</span>- </DropdownMenu.Item>- </div>- {/snippet}- </Tooltip.Trigger>-- <Tooltip.Content side="right">- <p>{item.disabledTooltip}</p>- </Tooltip.Content>- </Tooltip.Root>- {/if}- {/each}- </DropdownMenu.SubContent>- </DropdownMenu.Sub>++ {#if supportedModalities.length > 0}+ <span class="flex items-center gap-0.75 text-muted-foreground">+ {#each supportedModalities as modality (modality.label)}+ <Tooltip.Root>+ <Tooltip.Trigger>+ <modality.icon class="size-2.75" />+ </Tooltip.Trigger>++ <Tooltip.Content>+ <p>{modality.label}</p>+ </Tooltip.Content>+ </Tooltip.Root>+ {/each}+ </span>+ {/if}+ </span>+ </DropdownMenu.Item><DropdownMenu.Itemclass="flex cursor-pointer items-center gap-2"diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelteindex 1b6fc4b020..197d6c2e59 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelte@@ -8,70 +8,68 @@const reasoning = useReasoningMenu();</script>-{#if reasoning.modelSupportsThinking}- <DropdownMenu.Sub>- <DropdownMenu.SubTrigger class="flex cursor-pointer items-center gap-2">- {#if reasoning.thinkingEnabled}- <Lightbulb class="{ICON_CLASS_DEFAULT} shrink-0 text-amber-400" />- {:else if reasoning.isOff}- <LightbulbOff class="{ICON_CLASS_DEFAULT} shrink-0 text-muted-foreground" />- {:else}- <Lightbulb class="{ICON_CLASS_DEFAULT} shrink-0 text-muted-foreground" />- {/if}+<DropdownMenu.Sub>+ <DropdownMenu.SubTrigger class="flex cursor-pointer items-center gap-2">+ {#if reasoning.isReasoningActive}+ <Lightbulb class="{ICON_CLASS_DEFAULT} shrink-0 text-amber-400" />+ {:else if reasoning.isOff}+ <LightbulbOff class="{ICON_CLASS_DEFAULT} shrink-0 text-muted-foreground" />+ {:else}+ <Lightbulb class="{ICON_CLASS_DEFAULT} shrink-0 text-muted-foreground" />+ {/if}- <span- class="text-sm inline-flex gap-2 {!reasoning.thinkingEnabled- ? 'text-muted-foreground'- : ''}"- >- Reasoning+ <span+ class="text-sm inline-flex gap-2 {!reasoning.isReasoningActive+ ? 'text-muted-foreground'+ : ''}"+ >+ Reasoning- <span class="capitalize text-muted-foreground">- {reasoning.currentEffort}- </span>+ <span class="capitalize text-muted-foreground">+ {reasoning.currentEffort}</span>- </DropdownMenu.SubTrigger>+ </span>+ </DropdownMenu.SubTrigger>- <DropdownMenu.SubContent- class="w-60 bg-popover p-1.5 text-popover-foreground shadow-md outline-none"- >- {#each reasoning.levels as level (level.value)}- {@const tokenLabel = reasoning.tokenLabel(level)}- <DropdownMenu.Item- class="flex w-full cursor-pointer items-center gap-3 rounded-md px-2 py-1.75 text-left text-sm transition-colors hover:bg-accent {reasoning.isSelected(- level- )- ? 'bg-accent'- : ''}"- onclick={() => reasoning.select(level)}- >- {#if reasoning.isSelected(level)}- <Check class="{ICON_CLASS_DEFAULT} shrink-0 text-foreground" />- {:else}- <div class="{ICON_CLASS_DEFAULT} shrink-0"></div>- {/if}+ <DropdownMenu.SubContent+ class="w-60 bg-popover p-1.5 text-popover-foreground shadow-md outline-none"+ >+ {#each reasoning.levels as level (level.value)}+ {@const tokenLabel = reasoning.tokenLabel(level)}+ <DropdownMenu.Item+ class="flex w-full cursor-pointer items-center gap-3 rounded-md px-2 py-1.75 text-left text-sm transition-colors hover:bg-accent {reasoning.isSelected(+ level+ )+ ? 'bg-accent'+ : ''}"+ onclick={() => reasoning.select(level)}+ >+ {#if reasoning.isSelected(level)}+ <Check class="{ICON_CLASS_DEFAULT} shrink-0 text-foreground" />+ {:else}+ <div class="{ICON_CLASS_DEFAULT} shrink-0"></div>+ {/if}- <span class="flex-1">{level.label}</span>+ <span class="flex-1">{level.label}</span>- {#if tokenLabel}- <span class="text-[11px] text-muted-foreground opacity-60">- {tokenLabel}- </span>- {/if}+ {#if tokenLabel}+ <span class="text-[11px] text-muted-foreground opacity-60">+ {tokenLabel}+ </span>+ {/if}- {#if level.hasInfo}- <Tooltip.Root>- <Tooltip.Trigger>- <Info class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />- </Tooltip.Trigger>+ {#if level.hasInfo}+ <Tooltip.Root>+ <Tooltip.Trigger>+ <Info class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />+ </Tooltip.Trigger>- <Tooltip.Content side="left">- <p>Maximum reasoning effort with extended context usage</p>- </Tooltip.Content>- </Tooltip.Root>- {/if}- </DropdownMenu.Item>- {/each}- </DropdownMenu.SubContent>- </DropdownMenu.Sub>-{/if}+ <Tooltip.Content side="left">+ <p>Maximum reasoning effort with extended context usage</p>+ </Tooltip.Content>+ </Tooltip.Root>+ {/if}+ </DropdownMenu.Item>+ {/each}+ </DropdownMenu.SubContent>+</DropdownMenu.Sub>diff --git a/tools/ui/src/lib/components/app/models/ModelId.svelte b/tools/ui/src/lib/components/app/models/ModelId.svelteindex cae0a7e3ed..0b9722a73c 100644--- a/tools/ui/src/lib/components/app/models/ModelId.svelte+++ b/tools/ui/src/lib/components/app/models/ModelId.svelte@@ -1,27 +1,44 @@<script lang="ts">import { TruncatedText } from '$lib/components/app';+ import * as Tooltip from '$lib/components/ui/tooltip';+ import {+ CAPABILITY_FLAG_KEYS,+ CAPABILITY_ICONS,+ CAPABILITY_LABELS,+ MODALITY_FLAG_KEYS,+ MODALITY_ICONS,+ MODALITY_LABELS+ } from '$lib/constants';+ import { ModelCapability, ModelModality } from '$lib/enums';import { ModelsService } from '$lib/services/models.service';import { settingsStore } from '$lib/stores';+ import type { ModelCapabilities, ModelModalities } from '$lib/types/models';interface Props {modelId: string;hideOrgName?: boolean;showRaw?: boolean;+ showRawTooltip?: boolean;hideQuantization?: boolean;hideTags?: boolean;aliases?: string[];tags?: string[];+ modalities?: ModelModalities;+ capabilities?: ModelCapabilities;class?: string;}let {aliases,+ capabilities,class: className = '',hideOrgName = false,hideQuantization,hideTags,+ modalities,modelId,showRaw = undefined,+ showRawTooltip = false,tags,...rest}: Props = $props();@@ -43,6 +60,16 @@let uniqueAliases = $derived([...new Set(aliases ?? [])]);let uniqueTags = $derived([...new Set([...(parsed.tags ?? []), ...(tags ?? [])])]);+ const allModalities = [ModelModality.VISION, ModelModality.VIDEO, ModelModality.AUDIO] as const;+ const allCapabilities: ModelCapability[] = [ModelCapability.REASONING];++ let activeModalities = $derived(+ allModalities.filter((modality) => modalities?.[MODALITY_FLAG_KEYS[modality]])+ );+ let activeCapabilities = $derived(+ allCapabilities.filter((capability) => capabilities?.[CAPABILITY_FLAG_KEYS[capability]])+ );+let primaryAlias = $derived(uniqueAliases.length === 1 ? uniqueAliases[0] : null);let displayName = $derived(primaryAlias ?? parsed.modelName ?? modelId);</script>@@ -50,37 +77,87 @@{#if resolvedShowRaw}<TruncatedText class="font-medium {className}" showTooltip={false} text={modelId} {...rest} />{:else}- <span class="flex min-w-0 flex-wrap items-center gap-1 {className}" {...rest}>+ {#snippet nameAndBadges()}<span class="min-w-0 truncate font-medium">{#if !hideOrgName && parsed.orgName}{parsed.orgName}/{/if}{displayName}</span>- {#if parsed.params}- <span class={badgeClass}>- {parsed.params}{parsed.activatedParams ? `-${parsed.activatedParams}` : ''}- </span>- {/if}+ <span class="inline-flex items-center gap-1">+ {#if parsed.params}+ <span class={badgeClass}>+ {parsed.params}{parsed.activatedParams ? `-${parsed.activatedParams}` : ''}+ </span>+ {/if}- {#if parsed.quantization && !resolvedHideQuantization}- <span class={badgeClass}>- {parsed.quantization}- </span>- {/if}+ {#if parsed.quantization && !resolvedHideQuantization}+ <span class={badgeClass}>+ {parsed.quantization}+ </span>+ {/if}- {#if primaryAlias}- {#if primaryAlias !== parsed.modelName}- <span class={badgeClass}>{parsed.modelName ?? modelId}</span>+ {#if primaryAlias}+ {#if primaryAlias !== parsed.modelName}+ <span class={badgeClass}>{parsed.modelName ?? modelId}</span>+ {/if}+ {:else if uniqueAliases.length > 1}+ {#each uniqueAliases as alias (alias)}+ <span class={badgeClass}>{alias}</span>+ {/each}{/if}- {:else if uniqueAliases.length > 1}- {#each uniqueAliases as alias (alias)}- <span class={badgeClass}>{alias}</span>- {/each}++ {#if uniqueTags.length > 0 && !resolvedHideTags}+ {#each uniqueTags as tag (tag)}+ <span class={tagBadgeClass}>{tag}</span>+ {/each}+ {/if}+ </span>+ {/snippet}++ <span class="flex min-w-0 items-center gap-1.5 {className}" {...rest}>+ {#if showRawTooltip}+ <Tooltip.Root>+ <Tooltip.Trigger class="flex min-w-0 items-center gap-1.5">+ {@render nameAndBadges()}+ </Tooltip.Trigger>++ <Tooltip.Content>+ <p>{modelId}</p>+ </Tooltip.Content>+ </Tooltip.Root>+ {:else}+ {@render nameAndBadges()}{/if}- {#if uniqueTags.length > 0 && !resolvedHideTags}- {#each uniqueTags as tag (tag)}- <span class={tagBadgeClass}>{tag}</span>- {/each}+ {#if activeCapabilities.length > 0 || activeModalities.length > 0}+ <span class="inline-flex items-center gap-1.25 text-muted-foreground">+ {#each activeCapabilities as capability (capability)}+ {@const CapabilityIcon = CAPABILITY_ICONS[capability]}++ <Tooltip.Root>+ <Tooltip.Trigger>+ <CapabilityIcon class="h-3 w-3 text-muted-foreground" />+ </Tooltip.Trigger>++ <Tooltip.Content>+ <p>{CAPABILITY_LABELS[capability]}</p>+ </Tooltip.Content>+ </Tooltip.Root>+ {/each}++ {#each activeModalities as modality (modality)}+ {@const ModalityIcon = MODALITY_ICONS[modality]}++ <Tooltip.Root>+ <Tooltip.Trigger>+ <ModalityIcon class="h-3 w-3 text-muted-foreground" />+ </Tooltip.Trigger>++ <Tooltip.Content>+ <p>{MODALITY_LABELS[modality]}</p>+ </Tooltip.Content>+ </Tooltip.Root>+ {/each}+ </span>{/if}</span>{/if}diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelteindex 1e1798e2fa..30dedcbae9 100644--- a/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte@@ -1,8 +1,9 @@<script lang="ts">import ModelLoadHighlight from './ModelLoadHighlight.svelte';import type { ModelItem } from './utils';- import { ChevronDown, Loader2 } from '@lucide/svelte';+ import { ChevronDown, Lightbulb, Loader2 } from '@lucide/svelte';import {+ ChatFormActionAddReasoningSubmenu,DialogModelInformation,DropdownMenuSearchable,ModelId,@@ -11,10 +12,11 @@} from '$lib/components/app';import * as DropdownMenu from '$lib/components/ui/dropdown-menu';import * as Tooltip from '$lib/components/ui/tooltip';- import { MODEL_SELECTOR_ICON } from '$lib/constants';+ import { MODEL_SELECTOR_ICON, SETTINGS_KEYS } from '$lib/constants';import { KeyboardKey, ServerModelStatus } from '$lib/enums';import { useModelsSelector } from '$lib/hooks/use-models-selector.svelte';- import { modelsStore } from '$lib/stores';+ import { useReasoningMenu } from '$lib/hooks/use-reasoning-menu.svelte';+ import { modelsStore, settingsStore } from '$lib/stores';import { modelLoadFraction } from '$lib/utils';interface Props {@@ -37,6 +39,9 @@let isOpen = $state(false);let highlightedId = $state<string | null>(null);+ // The model submenu opens together with the menu so the list and its search+ // box are immediately available, as before the submenu was introduced+ let modelSubOpen = $state(false);const ms = useModelsSelector({currentModel: () => currentModel,@@ -44,24 +49,41 @@onOpenChange: (open) => {isOpen = open;highlightedId = null;++ if (open) {+ // Defer submenu open so the Sub component is mounted first;+ // setting bind:open synchronously can be lost if the Sub hasn't+ // rendered yet.+ queueMicrotask(() => {+ if (isOpen) modelSubOpen = true;+ });+ } else {+ modelSubOpen = false;+ }},useGlobalSelection: () => useGlobalSelection});+ const reasoning = useReasoningMenu();++ const showOrgNameInTrigger = $derived(+ settingsStore.config[SETTINGS_KEYS.SHOW_MODEL_ORG_NAME_IN_TRIGGER] ?? false+ );+$effect(() => {void ms.searchTerm;highlightedId = null;});- // Focus the dropdown's search box without scrolling the page. bits-ui+ // Focus the model submenu's search box without scrolling the page. bits-ui// auto-focuses the opened content by default, which can yank the page// scroll; we prevent that on the Content and refocus the search here.$effect(() => {- if (!isOpen) return;+ if (!isOpen || !modelSubOpen) return;requestAnimationFrame(() => {const search = document.querySelector<HTMLElement>(- '[data-slot="dropdown-menu-content"] input'+ '[data-slot="dropdown-menu-sub-content"] input');search?.focus({ preventScroll: true });@@ -188,7 +210,7 @@<DropdownMenu.Trigger{...props}class={[- `relative inline-grid cursor-pointer grid-cols-[1fr_auto_1fr] items-center gap-1.5 rounded-sm bg-background px-1.5 py-1 text-xs shadow-sm transition hover:bg-muted-foreground/20 focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-60 dark:bg-muted-foreground/15 dark:text-secondary-foreground`,+ `relative inline-grid cursor-pointer grid-cols-[1fr_auto_1fr] items-center gap-1 rounded-sm bg-background px-1.5 py-1 text-xs shadow-sm transition hover:bg-muted-foreground/20 focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-60 dark:bg-muted-foreground/15 dark:text-secondary-foreground`,!ms.isCurrentModelInCache? 'bg-red-400/10 !text-red-400 hover:bg-red-400/20 hover:text-red-400': forceForegroundText@@ -203,16 +225,22 @@><MODEL_SELECTOR_ICON class="h-3.5 w-3.5 shrink-0" />- {#if selectedOption}- <ModelId- class="min-w-0 overflow-hidden"- hideOrgName={false}- hideQuantization- modelId={selectedOption.model}- />- {:else}- <span class="min-w-0 font-medium">Select model</span>- {/if}+ <span class="flex min-w-0 items-center gap-1">+ {#if selectedOption}+ <ModelId+ class="min-w-0 overflow-hidden"+ hideOrgName={!showOrgNameInTrigger}+ hideQuantization+ modelId={selectedOption.model}+ />+ {:else}+ <span class="min-w-0 font-medium">Select model</span>+ {/if}++ {#if reasoning.isReasoningActive}+ <Lightbulb class="h-3.5 w-3.5 shrink-0 text-amber-400" />+ {/if}+ </span>{#if ms.updating || ms.isLoadingModel}<Loader2 class="h-3 w-3.5 shrink-0 animate-spin" />@@ -236,73 +264,94 @@<DropdownMenu.Contentalign="end"- class="w-full max-w-[100vw] pt-0 sm:w-max sm:max-w-[calc(100vw-2rem)]"+ class="w-full md:min-w-64 md:max-w-80 max-w-[calc(100vw-2rem)]"onOpenAutoFocus={(event) => event.preventDefault()}>- <DropdownMenuSearchable- emptyMessage="No models found."- isEmpty={ms.filteredOptions.length === 0 && ms.isCurrentModelInCache}- onSearchChange={(v) => ms.setSearchTerm(v)}- onSearchKeyDown={handleSearchKeyDown}- placeholder="Search models..."- searchValue={ms.searchTerm}- >- <div class="models-list">- {#if !ms.isCurrentModelInCache && currentModel}- <!-- Show unavailable model as first option (disabled) -->- <button- aria-disabled="true"- aria-selected="true"- class="flex w-full cursor-not-allowed items-center bg-red-400/10 p-2 text-left text-sm text-red-400"- disabled- role="option"- type="button"- >- <ModelId class="flex-1" hideQuantization modelId={currentModel} />-- <span class="ml-2 text-xs whitespace-nowrap opacity-70">(not available)</span>- </button>- {/if}+ <DropdownMenu.Sub bind:open={modelSubOpen}>+ <DropdownMenu.SubTrigger class="flex cursor-pointer items-center gap-2">+ <MODEL_SELECTOR_ICON class="h-4 w-4" />- {#if ms.filteredOptions.length === 0}- <p class="px-4 py-3 text-sm text-muted-foreground">No models found.</p>+ {#if selectedOption}+ <ModelId+ class="min-w-0 flex-1 overflow-hidden"+ hideOrgName={!showOrgNameInTrigger}+ hideQuantization+ modelId={selectedOption.model}+ />+ {:else}+ <span class="min-w-0 flex-1 truncate text-muted-foreground">No model</span>{/if}+ </DropdownMenu.SubTrigger>++ <DropdownMenu.SubContent class="w-100 max-w-[calc(100vw-2rem)] pt-0">+ <DropdownMenuSearchable+ emptyMessage="No models found."+ isEmpty={ms.filteredOptions.length === 0 && ms.isCurrentModelInCache}+ onSearchChange={(v) => ms.setSearchTerm(v)}+ onSearchKeyDown={handleSearchKeyDown}+ placeholder="Search models..."+ searchValue={ms.searchTerm}+ >+ <div class="models-list">+ {#if !ms.isCurrentModelInCache && currentModel}+ <!-- Show unavailable model as first option (disabled) -->+ <button+ aria-disabled="true"+ aria-selected="true"+ class="flex w-full cursor-not-allowed items-center bg-red-400/10 p-2 text-left text-sm text-red-400"+ disabled+ role="option"+ type="button"+ >+ <ModelId class="flex-1" hideQuantization modelId={currentModel} />++ <span class="ml-2 text-xs whitespace-nowrap opacity-70">(not available)</span>+ </button>+ {/if}++ {#if ms.filteredOptions.length === 0}+ <p class="px-4 py-3 text-sm text-muted-foreground">No models found.</p>+ {/if}++ {#snippet modelOption(item: ModelItem, hideOrgName: boolean)}+ {@const { option } = item}+ {@const isSelected = currentModel === option.model || ms.activeId === option.id}+ {@const isHighlighted = option.id === highlightedId}+ {@const isFav = ms.isFavorite(option.model)}++ <ModelsSelectorOption+ {hideOrgName}+ {isFav}+ {isHighlighted}+ {isSelected}+ onInfoClick={ms.handleInfoClick}+ onKeyDown={(event) => {+ if (event.key === KeyboardKey.ENTER || event.key === KeyboardKey.SPACE) {+ event.preventDefault();+ void handleModelKeyAction(option.id, event.altKey);+ }+ }}+ onMouseEnter={() => (highlightedId = option.id)}+ onSelect={ms.handleSelect}+ {option}+ />+ {/snippet}++ <ModelsSelectorList+ activeId={ms.activeId}+ {currentModel}+ groups={ms.groupedFilteredOptions}+ onInfoClick={ms.handleInfoClick}+ onSelect={ms.handleSelect}+ renderOption={modelOption}+ sectionHeaderClass="my-1.5 px-2 py-2 text-[13px] font-semibold text-muted-foreground/70 select-none"+ />+ </div>+ </DropdownMenuSearchable>+ </DropdownMenu.SubContent>+ </DropdownMenu.Sub>- {#snippet modelOption(item: ModelItem, hideOrgName: boolean)}- {@const { option } = item}- {@const isSelected = currentModel === option.model || ms.activeId === option.id}- {@const isHighlighted = option.id === highlightedId}- {@const isFav = ms.isFavorite(option.model)}-- <ModelsSelectorOption- {hideOrgName}- {isFav}- {isHighlighted}- {isSelected}- onInfoClick={ms.handleInfoClick}- onKeyDown={(event) => {- if (event.key === KeyboardKey.ENTER || event.key === KeyboardKey.SPACE) {- event.preventDefault();- void handleModelKeyAction(option.id, event.altKey);- }- }}- onMouseEnter={() => (highlightedId = option.id)}- onSelect={ms.handleSelect}- {option}- />- {/snippet}-- <ModelsSelectorList- activeId={ms.activeId}- {currentModel}- groups={ms.groupedFilteredOptions}- onInfoClick={ms.handleInfoClick}- onSelect={ms.handleSelect}- renderOption={modelOption}- sectionHeaderClass="my-1.5 px-2 py-2 text-[13px] font-semibold text-muted-foreground/70 select-none"- />- </div>- </DropdownMenuSearchable>+ <ChatFormActionAddReasoningSubmenu /></DropdownMenu.Content></DropdownMenu.Root>{:else}@@ -332,12 +381,16 @@{#if selectedOption}<ModelIdclass="min-w-0 overflow-hidden"- hideOrgName={false}+ hideOrgName={!showOrgNameInTrigger}hideQuantizationmodelId={selectedOption.model}/>{/if}+ {#if reasoning.isReasoningActive}+ <Lightbulb class="h-3.5 w-3.5 shrink-0 text-amber-400" />+ {/if}+{#if ms.updating}<Loader2 class="h-3 w-3.5 shrink-0 animate-spin" />{/if}diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelteindex 77e626c3e1..1faeb0c4a5 100644--- a/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte@@ -58,6 +58,10 @@let loadProgress = $derived(isLoading ? modelsStore.status.getLoadProgress(option.model) : null);let loadPercent = $derived(Math.round(modelLoadFraction(loadProgress) * 100));let loadTitle = $derived(modelLoadProgressText(loadProgress));+ let modalities = $derived(option.modalities);+ let capabilities = $derived.by(() => ({+ reasoning: modelsStore.props.checkModelSupportsThinking(option.model)+ }));</script><div@@ -65,9 +69,11 @@class={['group relative flex w-full items-center gap-2 rounded-sm p-2 text-left text-sm transition focus:outline-none','cursor-pointer',- isSelected && 'bg-accent/50 text-accent-foreground',+ isSelected && !isHighlighted && 'bg-accent/50',isHighlighted && 'bg-accent',- !isSelected && !isHighlighted && 'hover:bg-muted',+ (isSelected || isHighlighted) && 'text-accent-foreground',+ 'hover:bg-accent',+ 'focus:bg-accent',isLoaded ? 'text-popover-foreground' : 'text-muted-foreground']}onclick={() => onSelect(option.id)}@@ -79,9 +85,12 @@><ModelIdaliases={option.aliases}+ {capabilities}class="flex-1"{hideOrgName}+ {modalities}modelId={option.model}+ showRawTooltiptags={option.tags}/>diff --git a/tools/ui/src/lib/components/app/models/utils.ts b/tools/ui/src/lib/components/app/models/utils.tsindex b78e7085b7..35bfb58a25 100644--- a/tools/ui/src/lib/components/app/models/utils.ts+++ b/tools/ui/src/lib/components/app/models/utils.ts@@ -1,3 +1,4 @@+import { ModelModality } from '$lib/enums';import type { ModelOption } from '$lib/types/models';import { SvelteMap } from 'svelte/reactivity';@@ -17,6 +18,23 @@ export interface GroupedModelOptions {available: OrgGroup[];}+function matchesModality(option: ModelOption, term: string): boolean {+ const modalities = option.modalities;++ if (!modalities) return false;++ switch (term) {+ case ModelModality.VISION.toLowerCase():+ return modalities.vision;+ case ModelModality.AUDIO.toLowerCase():+ return modalities.audio;+ case ModelModality.VIDEO.toLowerCase():+ return modalities.video;+ default:+ return false;+ }+}+export function filterModelOptions(options: ModelOption[], searchTerm: string): ModelOption[] {const term = searchTerm.trim().toLowerCase();@@ -27,7 +45,8 @@ export function filterModelOptions(options: ModelOption[], searchTerm: string):option.model.toLowerCase().includes(term) ||option.name?.toLowerCase().includes(term) ||option.aliases?.some((alias: string) => alias.toLowerCase().includes(term)) ||- option.tags?.some((tag: string) => tag.toLowerCase().includes(term))+ option.tags?.some((tag: string) => tag.toLowerCase().includes(term)) ||+ matchesModality(option, term));}diff --git a/tools/ui/src/lib/constants/icons.constants.ts b/tools/ui/src/lib/constants/icons.constants.tsindex 5563740509..a0ce22f95e 100644--- a/tools/ui/src/lib/constants/icons.constants.ts+++ b/tools/ui/src/lib/constants/icons.constants.ts@@ -8,10 +8,13 @@ import {File as FileIcon,FileText as FileTextIcon,Image as ImageIcon,+ Lightbulb as ReasoningIcon,Mic as AudioIcon,Video as VideoIcon} from '@lucide/svelte';-import { FileTypeCategory, ModelModality } from '$lib/enums';+import { FileTypeCategory, ModelCapability, ModelModality } from '$lib/enums';+import type { ModelCapabilities, ModelModalities } from '$lib/types/models';+import type { Component } from 'svelte';export const FILE_TYPE_ICONS = {[FileTypeCategory.AUDIO]: AudioIcon,@@ -35,6 +38,29 @@ export const MODALITY_LABELS = {[ModelModality.VISION]: 'Vision'} as const;+/** Maps an input ModelModality to the boolean flag it drives on the ModelModalities type */+export const MODALITY_FLAG_KEYS: Record<+ Exclude<ModelModality, ModelModality.TEXT>,+ keyof ModelModalities+> = {+ [ModelModality.AUDIO]: 'audio',+ [ModelModality.VIDEO]: 'video',+ [ModelModality.VISION]: 'vision'+};++export const CAPABILITY_ICONS: Record<ModelCapability, Component> = {+ [ModelCapability.REASONING]: ReasoningIcon+} as const;++export const CAPABILITY_LABELS: Record<ModelCapability, string> = {+ [ModelCapability.REASONING]: 'Reasoning'+} as const;++/** Maps a ModelCapability to the boolean flag it drives on the ModelCapabilities type */+export const CAPABILITY_FLAG_KEYS: Record<ModelCapability, keyof ModelCapabilities> = {+ [ModelCapability.REASONING]: 'reasoning'+};+// Shared SVG icon strings for copy and preview buttonsexport const COPY_ICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-copy-icon lucide-copy"><rect width="14" height="14" x="8" y="8" rx="2" ry="2"/><path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2"/></svg>`;diff --git a/tools/ui/src/lib/constants/settings-keys.constants.ts b/tools/ui/src/lib/constants/settings-keys.constants.tsindex c8761c7587..2c923cee38 100644--- a/tools/ui/src/lib/constants/settings-keys.constants.ts+++ b/tools/ui/src/lib/constants/settings-keys.constants.ts@@ -54,6 +54,7 @@ export const SETTINGS_KEYS = {SHOW_FULL_PATH_IN_MENTIONS: 'showFullPathInMentions',// DisplaySHOW_MESSAGE_STATS: 'showMessageStats',+ SHOW_MODEL_ORG_NAME_IN_TRIGGER: 'showModelOrgNameInTrigger',SHOW_MODEL_QUANTIZATION: 'showModelQuantization',SHOW_MODEL_TAGS: 'showModelTags',SHOW_RAW_MODEL_NAMES: 'showRawModelNames',diff --git a/tools/ui/src/lib/constants/settings.constants.ts b/tools/ui/src/lib/constants/settings.constants.tsindex b4699af197..7140bbcc4a 100644--- a/tools/ui/src/lib/constants/settings.constants.ts+++ b/tools/ui/src/lib/constants/settings.constants.ts@@ -111,9 +111,8 @@ export const SETTINGS_REGISTRY: SettingsSectionEntry[] = [type: SettingsFieldType.CHECKBOX},{- defaultValue: false,+ defaultValue: true,help: 'Automatically show microphone button instead of send button when textarea is empty for models with audio modality support.',- isExperimental: true,key: SETTINGS_KEYS.AUTO_MIC_ON_EMPTY,label: 'Show microphone on empty input',type: SettingsFieldType.CHECKBOX@@ -283,6 +282,13 @@ export const SETTINGS_REGISTRY: SettingsSectionEntry[] = [label: 'Show model tags',type: SettingsFieldType.CHECKBOX},+ {+ defaultValue: false,+ help: 'Display the organization name in the model selector trigger button.',+ key: SETTINGS_KEYS.SHOW_MODEL_ORG_NAME_IN_TRIGGER,+ label: 'Show organization name in model selector trigger',+ type: SettingsFieldType.CHECKBOX+ },{defaultValue: false,help: 'Display the current build version in the bottom-right corner of the interface.',diff --git a/tools/ui/src/lib/enums/index.ts b/tools/ui/src/lib/enums/index.tsindex efe5789e20..e0b15bc729 100644--- a/tools/ui/src/lib/enums/index.ts+++ b/tools/ui/src/lib/enums/index.ts@@ -67,7 +67,7 @@ export {JsonSchemaType} from './mcp.enums';-export { ModelModality } from './model.enums';+export { ModelCapability, ModelModality } from './model.enums';export { ServerRole, ServerModelStatus, ServerModelsSseEventType } from './server.enums';diff --git a/tools/ui/src/lib/enums/model.enums.ts b/tools/ui/src/lib/enums/model.enums.tsindex df85c9d896..db085a27a7 100644--- a/tools/ui/src/lib/enums/model.enums.ts+++ b/tools/ui/src/lib/enums/model.enums.ts@@ -4,3 +4,7 @@ export enum ModelModality {VIDEO = 'VIDEO',VISION = 'VISION'}++export enum ModelCapability {+ REASONING = 'REASONING'+}diff --git a/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.ts b/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.tsindex 2cb9c90609..3c52d7ab27 100644--- a/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.ts+++ b/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.ts@@ -8,6 +8,7 @@ import { getConversationModel } from '$lib/utils';export interface UseReasoningMenuReturn {readonly modelSupportsThinking: boolean;readonly thinkingEnabled: boolean;+ readonly isReasoningActive: boolean;readonly isOff: boolean;readonly currentEffort: ReasoningEffort;readonly levels: ReasoningEffortLevel[];@@ -59,6 +60,12 @@ export function useReasoningMenu(): UseReasoningMenuReturn {const thinkingEnabled = $derived(currentEffort !== ReasoningEffort.OFF && currentEffort !== ReasoningEffort.DEFAULT);+ // Thinking is effectively on (lightbulb lit) either when an explicit effort+ // is selected, or when the effort is left at "Default" and the model+ // supports thinking.+ const isReasoningActive = $derived(+ thinkingEnabled || (currentEffort === ReasoningEffort.DEFAULT && modelSupportsThinking)+ );return {get currentEffort() {@@ -67,6 +74,9 @@ export function useReasoningMenu(): UseReasoningMenuReturn {get isOff() {return currentEffort === ReasoningEffort.OFF;},+ get isReasoningActive() {+ return isReasoningActive;+ },isSelected(level: ReasoningEffortLevel): boolean {return currentEffort === level.value;},diff --git a/tools/ui/src/lib/services/models.service.ts b/tools/ui/src/lib/services/models.service.tsindex bb1bbd356a..b0fcca0eec 100644--- a/tools/ui/src/lib/services/models.service.ts+++ b/tools/ui/src/lib/services/models.service.ts@@ -187,8 +187,17 @@ export class ModelsService {// 6. Model name = segments before params; tags = remaining segments after paramsconst pivotIdx = paramsIdx !== MODEL_ID.NOT_FOUND ? paramsIdx : segments.length;+ const modelSegments = segments.slice(0, pivotIdx);++ // strip trailing container-format segments (e.g. GGUF) from the model name+ while (+ modelSegments.length > 0 &&+ MODEL_ID.IGNORED_SEGMENTS.has(modelSegments[modelSegments.length - 1].toUpperCase())+ ) {+ modelSegments.pop();+ }- result.modelName = segments.slice(0, pivotIdx).join(MODEL_ID.SEGMENT_SEPARATOR) || null;+ result.modelName = modelSegments.join(MODEL_ID.SEGMENT_SEPARATOR) || null;if (paramsIdx !== MODEL_ID.NOT_FOUND) {result.tags = segments.slice(paramsIdx + 1).filter((_, relIdx) => {diff --git a/tools/ui/src/lib/types/index.ts b/tools/ui/src/lib/types/index.tsindex 62947cd493..d91c2811a4 100644--- a/tools/ui/src/lib/types/index.ts+++ b/tools/ui/src/lib/types/index.ts@@ -89,6 +89,7 @@ export type {// Model typesexport type {+ ModelCapabilities,ModelModalities,ModelOption,ModelLoadProgress,diff --git a/tools/ui/src/lib/types/models.d.ts b/tools/ui/src/lib/types/models.d.tsindex b32c16f6f2..0b7523113d 100644--- a/tools/ui/src/lib/types/models.d.ts+++ b/tools/ui/src/lib/types/models.d.ts@@ -6,6 +6,10 @@ export interface ModelModalities {video: boolean;}+export interface ModelCapabilities {+ reasoning: boolean;+}+export interface ModelOption {id: string;name: string;diff --git a/tools/ui/tests/unit/model-id-parser.test.ts b/tools/ui/tests/unit/model-id-parser.test.tsindex 3dac1dfaba..5903f196ab 100644--- a/tools/ui/tests/unit/model-id-parser.test.ts+++ b/tools/ui/tests/unit/model-id-parser.test.ts@@ -97,6 +97,38 @@ describe('parseModelId', () => {});});+ it('strips trailing container format segments from model names', () => {+ expect(parseModelId('unsloth/DeepSeek-V4-Flash-0731-GGUF:Q2_K_XL')).toStrictEqual({+ activatedParams: null,+ modelName: 'DeepSeek-V4-Flash-0731',+ orgName: 'unsloth',+ params: null,+ quantization: 'Q2_K_XL',+ raw: 'unsloth/DeepSeek-V4-Flash-0731-GGUF:Q2_K_XL',+ tags: []+ });++ expect(parseModelId('unsloth/Laguna-S-2.1-GGUF:Q4_K_XL')).toStrictEqual({+ activatedParams: null,+ modelName: 'Laguna-S-2.1',+ orgName: 'unsloth',+ params: null,+ quantization: 'Q4_K_XL',+ raw: 'unsloth/Laguna-S-2.1-GGUF:Q4_K_XL',+ tags: []+ });++ expect(parseModelId('org/Model-Name-GGUF')).toStrictEqual({+ activatedParams: null,+ modelName: 'Model-Name',+ orgName: 'org',+ params: null,+ quantization: null,+ raw: 'org/Model-Name-GGUF',+ tags: []+ });+ });+it('handles real-world examples correctly', () => {expect(parseModelId('meta-llama/Llama-3.1-8B')).toStrictEqual({activatedParams: null,