Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): restore provider-grouped llm model catalog
Josuéa36e9007e694
diff --git a/control-ui/app/globals.css b/control-ui/app/globals.cssindex 3b55fa072..b1d42b2ae 100644--- a/control-ui/app/globals.css+++ b/control-ui/app/globals.css@@ -11277,10 +11277,6 @@ td.cu-registry-description {padding-left: 0.85rem;}-.cu-llm-model-row > .cu-llm-provider-cell {- padding-left: var(--cu-space-2);-}-.cu-inline-icon-label {display: inline-flex;align-items: center;@@ -11383,12 +11379,12 @@ td.cu-registry-description {gap: var(--cu-space-2);}-.cu-llm-model-group__row > td {+.cu-llm-model-group .eft-table-group__summary-row > td {padding: 0;background: var(--cu-bg-elevated);}-.cu-table tbody .cu-llm-model-group__row:hover > td {+.cu-table .cu-llm-model-group .eft-table-group__summary-row:hover > td {background: var(--cu-surface-hover);}@@ -11412,20 +11408,12 @@ td.cu-registry-description {outline-offset: -2px;}-.cu-llm-model-group__chevron {+.cu-llm-model-group .eft-table-group__indicator {display: inline-flex;flex: 0 0 auto;color: var(--cu-text-muted);}-.cu-llm-model-group__chevron svg {- transition: transform var(--cu-control-transition);-}--.cu-llm-model-group__chevron svg.is-expanded {- transform: rotate(90deg);-}-.cu-llm-model-group__provider {min-width: 10rem;font-weight: 600;diff --git a/control-ui/components/LlmModelTable.tsx b/control-ui/components/LlmModelTable.tsxindex 0df1fb786..5ee803dd1 100644--- a/control-ui/components/LlmModelTable.tsx+++ b/control-ui/components/LlmModelTable.tsx@@ -1,7 +1,13 @@'use client'import React, { useEffect, useMemo, useState } from 'react'-import { DataTable, TableStateRow, TableViewport, useTableSort } from '@clerum/frontend-components'+import {+ DataTable,+ GroupedTableBody,+ TableStateRow,+ TableViewport,+ useTableSort,+} from '@clerum/frontend-components'import type { LlmAllowedModel } from '@lib/api'import { catalogGroupKey, formatContextWindow, getProviderDisplayLabel } from '@lib/llm'import { isUnpricedAllowedModel } from '@lib/llmModelUnpriced'@@ -81,6 +87,7 @@ export function LlmModelTable({const [providerFilter, setProviderFilter] = useState<string>(ALL_PROVIDERS)const [enabledFilter, setEnabledFilter] = useState<EnabledFilter>('all')const [sourceFilter, setSourceFilter] = useState<SourceFilter>('all')+ const [expandedProviders, setExpandedProviders] = useState<Set<string>>(new Set())const normalizedSearch = searchQuery.trim().toLowerCase()const providerOptions = useMemo(() => {@@ -182,6 +189,34 @@ export function LlmModelTable({},})+ const groupedItems = useMemo(() => {+ const groups = new Map<string, DisplayModel[]>()+ for (const model of modelSort.sortedRows) {+ const family = catalogGroupKey(model.provider)+ const group = groups.get(family)+ if (group) group.push(model)+ else groups.set(family, [model])+ }+ return Array.from(groups.entries()).sort(([left], [right]) =>+ getProviderDisplayLabel(left).localeCompare(getProviderDisplayLabel(right))+ )+ }, [modelSort.sortedRows])+ const visibleProviderKeys = groupedItems.map(([provider]) => provider).join('\u0000')++ // Search results must be visible without requiring another disclosure action.+ // Keep those groups in the manual set so clearing the query preserves the+ // operator's working context.+ useEffect(() => {+ if (!normalizedSearch) return+ setExpandedProviders(current => {+ const next = new Set(current)+ for (const provider of visibleProviderKeys.split('\u0000')) {+ if (provider) next.add(provider)+ }+ return next+ })+ }, [normalizedSearch, visibleProviderKeys])+const hasActiveFilter =Boolean(normalizedSearch) ||providerFilter !== ALL_PROVIDERS ||@@ -192,11 +227,21 @@ export function LlmModelTable({function handleProviderFilterChange(nextProvider: string) {setProviderFilter(nextProvider)+ if (nextProvider === ALL_PROVIDERS) return+ setExpandedProviders(current => new Set(current).add(nextProvider))+ }++ function setProviderExpanded(provider: string, expanded: boolean) {+ setExpandedProviders(current => {+ const next = new Set(current)+ if (expanded) next.add(provider)+ else next.delete(provider)+ return next+ })}const modelColumns: TableHeaderColumn[] = ([- { key: 'provider', label: 'Provider', minWidth: '9rem' },{ key: 'model', label: 'Model', minWidth: '15rem' },{ key: 'credential', label: 'Credential', width: '11rem' },{ key: 'vendor', label: 'Vendor', width: '10rem' },@@ -302,14 +347,16 @@ export function LlmModelTable({<thead><TableHeaderRow columns={modelColumns} /></thead>- <tbody className="cu-llm-model-group">- {isInitialLoad ? (+ {isInitialLoad ? (+ <tbody><TableStateRowcolSpan={modelColumns.length}kind="loading"message="Loading models…"/>- ) : filteredItems.length === 0 ? (+ </tbody>+ ) : filteredItems.length === 0 ? (+ <tbody><TableStateRowcolSpan={modelColumns.length}message={@@ -318,119 +365,157 @@ export function LlmModelTable({: 'No models in the allowlist yet. Add one to let agents and runtime use it.'}/>- ) : (- modelSort.sortedRows.map((model: DisplayModel) => (- <tr key={model.id} className="cu-table__row cu-llm-model-row">- <td className="cu-llm-provider-cell">- <span className="cu-inline-icon-label">- <LlmProviderIcon- provider={catalogGroupKey(model.provider)}- label={getProviderDisplayLabel(catalogGroupKey(model.provider))}- />- {getProviderDisplayLabel(catalogGroupKey(model.provider))}- </span>- </td>- <td className="cu-px-model">- <span className="cu-px-model-content">- {model.model}- {isUnpricedAllowedModel(model, unpricedKeys) ? (- <MissingPriceWarning provider={model.provider} model={model.model} />- ) : null}- </span>- </td>- <td>{model.credentialLabel || '—'}</td>- <td>{model.vendor || '—'}</td>- <td>{model.display_name || '—'}</td>- <td className="cu-px-num">{formatContextWindow(model.context_window_tokens)}</td>- <td>- <span- className={- model.enabled- ? 'cu-px-badge cu-px-badge--on'- : 'cu-px-badge cu-px-badge--off'- }- >- {model.enabled ? 'Enabled' : 'Disabled'}- </span>- </td>- <td>+ </tbody>+ ) : (+ groupedItems.map(([provider, models]) => {+ const providerLabel = getProviderDisplayLabel(provider)+ const providerModels = collapseFamilyRows(+ provider,+ items.filter(model => catalogGroupKey(model.provider) === provider)+ )+ const enabledCount = providerModels.filter(model => model.enabled).length+ const staleCount = providerModels.filter(model => model.stale).length+ const hasFilteredModels = models.length !== providerModels.length+ const expanded = expandedProviders.has(provider)++ return (+ <GroupedTableBody+ childBodyClassName="cu-llm-model-group__children"+ className="cu-llm-model-group"+ colSpan={modelColumns.length}+ disclosureClassName="cu-llm-model-group__toggle"+ disclosureLabel={isExpanded =>+ `${isExpanded ? 'Collapse' : 'Expand'} ${providerLabel} models`+ }+ expanded={expanded}+ groupId={provider}+ key={provider}+ onExpandedChange={nextExpanded => setProviderExpanded(provider, nextExpanded)}+ summary={<>- <span- className={- model.source === 'discovery'- ? 'cu-px-badge cu-px-badge--info'- : 'cu-px-badge cu-px-badge--off'- }- >- {model.source === 'discovery' ? 'Discovered' : 'Manual'}+ <LlmProviderIcon provider={provider} label={providerLabel} />+ <span className="cu-llm-model-group__provider">{providerLabel}</span>+ <span className="cu-llm-model-group__count">+ {providerModels.length} model{providerModels.length === 1 ? '' : 's'}</span>- {model.stale ? (+ <span className="cu-llm-model-group__summary">+ {enabledCount} enabled+ {staleCount > 0 ? ` · ${staleCount} stale` : ''}+ {hasFilteredModels ? ` · ${models.length} matching` : ''}+ </span>+ <span className="cu-llm-model-group__action" aria-hidden="true">+ {expanded ? 'Hide models' : 'Show models'}+ </span>+ </>+ }+ >+ {models.map((model: DisplayModel) => (+ <tr key={model.id} className="cu-table__row cu-llm-model-row">+ <td className="cu-px-model">+ <span className="cu-px-model-content">+ {model.model}+ {isUnpricedAllowedModel(model, unpricedKeys) ? (+ <MissingPriceWarning provider={model.provider} model={model.model} />+ ) : null}+ </span>+ </td>+ <td>{model.credentialLabel || '—'}</td>+ <td>{model.vendor || '—'}</td>+ <td>{model.display_name || '—'}</td>+ <td className="cu-px-num">+ {formatContextWindow(model.context_window_tokens)}+ </td>+ <td>+ <span+ className={+ model.enabled+ ? 'cu-px-badge cu-px-badge--on'+ : 'cu-px-badge cu-px-badge--off'+ }+ >+ {model.enabled ? 'Enabled' : 'Disabled'}+ </span>+ </td>+ <td><>- {' '}- <span className="cu-px-badge cu-px-badge--warn">Stale</span>+ <span+ className={+ model.source === 'discovery'+ ? 'cu-px-badge cu-px-badge--info'+ : 'cu-px-badge cu-px-badge--off'+ }+ >+ {model.source === 'discovery' ? 'Discovered' : 'Manual'}+ </span>+ {model.stale ? (+ <>+ {' '}+ <span className="cu-px-badge cu-px-badge--warn">Stale</span>+ </>+ ) : null}</>- ) : null}- </>- </td>- <td className="cu-px-actions">- <RowActionsMenu- ariaLabel={`Actions for model ${model.provider}/${model.model}`}- horizontalTrigger- actions={- model.apiKeyRow && model.subscriptionRow- ? [- {- key: 'edit-api-key',- label: 'Edit API key',- onClick: () => onEdit(model.apiKeyRow!.id),- },- {- key: 'edit-subscription',- label: 'Edit subscription',- onClick: () => onEdit(model.subscriptionRow!.id),- },- {- key: 'delete-api-key',- label:- deletingId === model.apiKeyRow.id- ? 'Deleting…'- : 'Delete API key',- danger: true,- disabled: deletingId === model.apiKeyRow.id,- onClick: () => void onDelete(model.apiKeyRow!),- },- {- key: 'delete-subscription',- label:- deletingId === model.subscriptionRow.id- ? 'Deleting…'- : 'Delete subscription',- danger: true,- disabled: deletingId === model.subscriptionRow.id,- onClick: () => void onDelete(model.subscriptionRow!),- },- ]- : [- {- key: 'edit',- label: 'Edit',- onClick: () => onEdit(model.id),- },- {- key: 'delete',- label: deletingId === model.id ? 'Deleting…' : 'Delete',- danger: true,- disabled: deletingId === model.id,- onClick: () => void onDelete(model),- },- ]- }- />- </td>- </tr>- ))- )}- </tbody>+ </td>+ <td className="cu-px-actions">+ <RowActionsMenu+ ariaLabel={`Actions for model ${model.provider}/${model.model}`}+ horizontalTrigger+ actions={+ model.apiKeyRow && model.subscriptionRow+ ? [+ {+ key: 'edit-api-key',+ label: 'Edit API key',+ onClick: () => onEdit(model.apiKeyRow!.id),+ },+ {+ key: 'edit-subscription',+ label: 'Edit subscription',+ onClick: () => onEdit(model.subscriptionRow!.id),+ },+ {+ key: 'delete-api-key',+ label:+ deletingId === model.apiKeyRow.id+ ? 'Deleting…'+ : 'Delete API key',+ danger: true,+ disabled: deletingId === model.apiKeyRow.id,+ onClick: () => void onDelete(model.apiKeyRow!),+ },+ {+ key: 'delete-subscription',+ label:+ deletingId === model.subscriptionRow.id+ ? 'Deleting…'+ : 'Delete subscription',+ danger: true,+ disabled: deletingId === model.subscriptionRow.id,+ onClick: () => void onDelete(model.subscriptionRow!),+ },+ ]+ : [+ {+ key: 'edit',+ label: 'Edit',+ onClick: () => onEdit(model.id),+ },+ {+ key: 'delete',+ label: deletingId === model.id ? 'Deleting…' : 'Delete',+ danger: true,+ disabled: deletingId === model.id,+ onClick: () => void onDelete(model),+ },+ ]+ }+ />+ </td>+ </tr>+ ))}+ </GroupedTableBody>+ )+ })+ )}</DataTable></TableViewport></div>diff --git a/control-ui/components/__tests__/LlmModelTable.test.tsx b/control-ui/components/__tests__/LlmModelTable.test.tsxindex c64f0f7f8..454a4fae4 100644--- a/control-ui/components/__tests__/LlmModelTable.test.tsx+++ b/control-ui/components/__tests__/LlmModelTable.test.tsx@@ -36,7 +36,7 @@ function renderTable(items: LlmAllowedModel[], unpricedKeys = new Set<string>())}function expandAnthropicModels() {- // Provider rows are no longer collapsed; retained as a no-op for row-focused tests below.+ fireEvent.click(screen.getByRole('button', { name: 'Expand Anthropic models' }))}describe('LlmModelTable catalog-lifecycle columns', () => {@@ -68,6 +68,7 @@ describe('LlmModelTable catalog-lifecycle columns', () => {updated_at: '2026-01-01T00:00:00.000Z',} as LlmAllowedModelrenderTable([legacy])+ fireEvent.click(screen.getByRole('button', { name: 'Expand OpenAI models' }))expect(screen.getByText('Manual', { selector: '.cu-px-badge' })).toBeInTheDocument()expect(screen.queryByText('Discovered')).not.toBeInTheDocument()expect(screen.queryByText('Stale', { selector: '.cu-px-badge--warn' })).toBeNull()@@ -103,12 +104,13 @@ describe('LlmModelTable catalog-lifecycle columns', () => {expect(screen.queryByRole('button', { name: /OpenAI Codex Subscription/i })).not.toBeInTheDocument()+ fireEvent.click(screen.getByRole('button', { name: 'Expand OpenAI models' }))expect(screen.getByText('gpt-5.1')).toBeInTheDocument()expect(screen.getByText('API key · Subscription')).toBeInTheDocument()expect(screen.getByText('gpt-5.3-codex').closest('tr')).toHaveTextContent('Subscription')})- it('edits the subscription row of a collapsed OpenAI family through the existing actions menu', () => {+ it('edits the subscription row of an expanded OpenAI family through the existing actions menu', () => {const onEdit = vi.fn()render(<LlmModelTable@@ -140,6 +142,7 @@ describe('LlmModelTable catalog-lifecycle columns', () => {loading={false}/>)+ fireEvent.click(screen.getByRole('button', { name: 'Expand OpenAI models' }))fireEvent.click(screen.getByRole('button', { name: 'Actions for model openai/gpt-5.1' }))fireEvent.click(screen.getByRole('menuitem', { name: 'Edit subscription' }))expect(onEdit).toHaveBeenCalledWith('oa-sub')@@ -221,7 +224,7 @@ describe('LlmModelTable filters', () => {await waitFor(() => {expect(screen.queryByLabelText('Filter by provider')).toBeNull()- expect(screen.getByText('claude-enabled')).toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'Expand Anthropic models' })).toBeInTheDocument()})expect(screen.queryByText('No models match this filter.')).toBeNull()})@@ -268,8 +271,8 @@ describe('LlmModelTable filters', () => {)})expect(screen.queryByText('No models match this filter.')).toBeNull()- expect(screen.getByText('claude-enabled')).toBeInTheDocument()- expect(screen.getByText('gemini-2.5-pro')).toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'Expand Anthropic models' })).toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'Expand google models' })).toBeInTheDocument()})it('shows the filtered empty state when no row matches', () => {@@ -281,7 +284,68 @@ describe('LlmModelTable filters', () => {})})-describe('LlmModelTable provider columns', () => {+describe('LlmModelTable states', () => {+ it('keeps the toolbar and semantic headers mounted while loading and empty', () => {+ const loadingView = render(+ <LlmModelTable+ items={[]}+ unpricedKeys={new Set()}+ onCreate={vi.fn()}+ onEdit={vi.fn()}+ onDelete={vi.fn().mockResolvedValue(undefined)}+ onRefresh={vi.fn()}+ deletingId={null}+ refreshing={false}+ loading+ />+ )++ expect(screen.getByRole('heading', { name: /LLM Models/ })).toBeInTheDocument()+ expect(screen.getByRole('columnheader', { name: /Model/i })).toBeInTheDocument()+ expect(screen.getByRole('status', { name: 'Loading models…' })).toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'Add model' })).toBeDisabled()++ loadingView.rerender(+ <LlmModelTable+ items={[]}+ unpricedKeys={new Set()}+ onCreate={vi.fn()}+ onEdit={vi.fn()}+ onDelete={vi.fn().mockResolvedValue(undefined)}+ onRefresh={vi.fn()}+ deletingId={null}+ refreshing={false}+ loading={false}+ />+ )++ expect(screen.getByRole('columnheader', { name: /Model/i })).toBeInTheDocument()+ expect(+ screen.getByText('No models in the allowlist yet. Add one to let agents and runtime use it.')+ ).toBeInTheDocument()+ })++ it('preserves grouped rows while refresh is in progress', () => {+ render(+ <LlmModelTable+ items={[baseModel]}+ unpricedKeys={new Set()}+ onCreate={vi.fn()}+ onEdit={vi.fn()}+ onDelete={vi.fn().mockResolvedValue(undefined)}+ onRefresh={vi.fn()}+ deletingId={null}+ refreshing+ loading={false}+ />+ )++ expect(screen.getByRole('button', { name: 'Refreshing…' })).toBeDisabled()+ expect(screen.getByRole('button', { name: 'Expand Anthropic models' })).toBeInTheDocument()+ })+})++describe('LlmModelTable provider groups', () => {const openAiModel: LlmAllowedModel = {...baseModel,id: 'openai-model',@@ -291,23 +355,49 @@ describe('LlmModelTable provider columns', () => {display_name: 'GPT-5',}- it('shows every model as a first-class row with readable provider identity', () => {+ it('renders one collapsed summary per provider family and expands independently', () => {renderTable([baseModel, openAiModel])+ expect(screen.getByRole('button', { name: 'Expand Anthropic models' })).toHaveAttribute(+ 'aria-expanded',+ 'false'+ )+ expect(screen.getByRole('button', { name: 'Expand OpenAI models' })).toHaveAttribute(+ 'aria-expanded',+ 'false'+ )+ expect(screen.queryByText('claude-sonnet-4-6')).toBeNull()+ expect(screen.queryByText('gpt-5')).toBeNull()++ expandAnthropicModels()+expect(screen.getByText('claude-sonnet-4-6')).toBeInTheDocument()- expect(screen.getByText('gpt-5')).toBeInTheDocument()- expect(screen.getByRole('columnheader', { name: /Provider/i })).toBeInTheDocument()- expect(screen.queryByRole('button', { name: /Expand .* models/ })).toBeNull()+ expect(screen.queryByText('gpt-5')).toBeNull()+ expect(screen.getByRole('button', { name: 'Collapse Anthropic models' })).toHaveAttribute(+ 'aria-expanded',+ 'true'+ )})- it('surfaces stale state on the affected record instead of a group summary', () => {- renderTable([{ ...baseModel, source: 'discovery', stale: true }])+ it('summarizes total, enabled, stale, and matching model counts', () => {+ renderTable([+ { ...baseModel, source: 'discovery', stale: true },+ { ...baseModel, id: 'disabled-model', model: 'claude-haiku', enabled: false },+ ])- expect(screen.getByText('claude-sonnet-4-6')).toBeInTheDocument()- expect(screen.getByText('Stale')).toBeVisible()+ const summary = screen.getByRole('button', { name: 'Expand Anthropic models' })+ expect(summary).toHaveTextContent('2 models')+ expect(summary).toHaveTextContent('1 enabled')+ expect(summary).toHaveTextContent('1 stale')++ fireEvent.change(screen.getByLabelText('Search models'), { target: { value: 'haiku' } })+ expect(screen.getByRole('button', { name: 'Collapse Anthropic models' })).toHaveTextContent(+ '1 matching'+ )+ expect(screen.getByText('claude-haiku')).toBeInTheDocument()})- it('filters first-class rows without provider disclosure state', () => {+ it('opens matching groups while searching and keeps them open after clearing search', () => {renderTable([baseModel,openAiModel,@@ -324,8 +414,14 @@ describe('LlmModelTable provider columns', () => {})expect(screen.getByText('gpt-5')).toBeInTheDocument()- expect(screen.queryByText('claude-sonnet-4-6')).toBeNull()- expect(screen.queryByText('o3')).toBeNull()+ expect(screen.queryByRole('button', { name: /Anthropic models/ })).toBeNull()+ expect(screen.getByRole('button', { name: 'Collapse OpenAI models' })).toHaveTextContent(+ '1 matching'+ )++ fireEvent.change(screen.getByLabelText('Search models'), { target: { value: '' } })+ expect(screen.getByRole('button', { name: 'Collapse OpenAI models' })).toBeInTheDocument()+ expect(screen.getByText('o3')).toBeInTheDocument()})it('opens a provider selected from the provider filter', () => {@@ -342,6 +438,23 @@ describe('LlmModelTable provider columns', () => {screen.getByRole('button', { name: 'Filter by provider' }).querySelector('img')).toHaveAttribute('src', '/provider-icons/openai.svg')expect(screen.queryByText('claude-sonnet-4-6')).toBeNull()+ expect(screen.getByRole('button', { name: 'Collapse OpenAI models' })).toHaveAttribute(+ 'aria-expanded',+ 'true'+ )+ })++ it('orders provider groups deterministically by display label', () => {+ renderTable([+ { ...openAiModel, id: 'google', provider: 'google', model: 'gemini' },+ openAiModel,+ baseModel,+ ])++ const groupLabels = Array.from(document.querySelectorAll('.cu-llm-model-group__provider')).map(+ node => node.textContent+ )+ expect(groupLabels).toEqual(['Anthropic', 'google', 'OpenAI'])})it('shows missing-price details and a prefilled CTA only on the affected row', () => {diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 6e19a7ac7..03eccd756 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.576",+ "version": "0.1.577","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.576",+ "version": "0.1.577","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/frontend-components": "file:../packages/frontend-components",diff --git a/control-ui/package.json b/control-ui/package.jsonindex 3d70dd5e1..3028160ce 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.576",+ "version": "0.1.577","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",