Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): r1-m1 preserve broker selection for providerless secret
Josuéa68f92c2a298
diff --git a/control-ui/app/hosts/[name]/page.tsx b/control-ui/app/hosts/[name]/page.tsxindex 7db25cb74..6232e93b9 100644--- a/control-ui/app/hosts/[name]/page.tsx+++ b/control-ui/app/hosts/[name]/page.tsx@@ -922,10 +922,6 @@ export default function HostDetailsPage() {return}setSecretRefDraft(parsed.name)- setConnectionRefDraft(CODEX_UNASSIGNED_CONNECTION_KEY)- setCodexModels([])- setGrokModels([])- setGrantCatalogError('')// Secret → provider sync (mirrors HostWizard.handleExistingSecretChange and// an explicit provider switch): when the picked secret carries provider// credentials (the same metadata that renders the option's provider icons),@@ -939,6 +935,10 @@ export default function HostDetailsPage() {.map(provider => normalizeProvider(provider.id)).filter(provider => !isOauthBrokerProvider(provider))if (pickedProviders.length > 0) {+ setConnectionRefDraft(CODEX_UNASSIGNED_CONNECTION_KEY)+ setCodexModels([])+ setGrokModels([])+ setGrantCatalogError('')if (!pickedProviders.includes(providerDraft)) {const nextProvider = pickedProviders[0]setProviderDraft(nextProvider)@@ -949,9 +949,6 @@ export default function HostDetailsPage() {))}- } else if (isOauthBrokerProvider(providerDraft)) {- setProviderDraft('openai')- setModelNameDraft(resolveDefaultModel('openai', getModelOptions(allowedCatalog, 'openai')))}}diff --git a/control-ui/components/__tests__/HostDetailsPage.conflict.test.tsx b/control-ui/components/__tests__/HostDetailsPage.conflict.test.tsxindex 6a72e19c0..5b567fda0 100644--- a/control-ui/components/__tests__/HostDetailsPage.conflict.test.tsx+++ b/control-ui/components/__tests__/HostDetailsPage.conflict.test.tsx@@ -9,11 +9,16 @@ import {waitFor,within,} from '@testing-library/react'+import { listHostSecrets } from '../../../control-api/src/routes/admin/hostSecrets'import HostDetailsPage from '../../app/hosts/[name]/page'import * as api from '../../lib/api'import { materializeHostResource } from '../../test/fixtures/contextResource'import { ToastProvider } from '../Toast'+vi.mock('../../../control-api/src/config', () => ({+ config: { hostSecretLabelKey: 'clerum.io/host-secret', hostSecretLabelValue: 'true' },+}))+const replaceMock = vi.fn()const pushMock = vi.fn()let mockParams: { name: string; tab?: string } = { name: 'foo' }@@ -150,6 +155,22 @@ function detailBundle(bundleHost: TestHost, secrets = defaultSecretResources) {}}+function produceHostSecretResources(name: string, keys: string[]) {+ return listHostSecrets({+ listSecrets: async () => [+ {+ metadata: {+ name,+ labels: {+ 'clerum.io/host-secret': 'true',+ },+ },+ keys,+ },+ ],+ } as Parameters<typeof listHostSecrets>[0])+}+function setupApiMocks(bundleHost: TestHost,refetchHost: TestHost = bundleHost,@@ -675,6 +696,105 @@ describe('HostDetailsPage current model and credential flow', () => {).toHaveTextContent('gpt-5.4-mini')})+ it('preserves a Grok provider and model when selecting a provider-less Secret', async () => {+ const grokModel = { provider: 'grok-subscription', name: 'grok-4.6' }+ const brokerHost = materializeHostResource(+ {+ metadata: { name: 'foo' },+ spec: {+ host: 'foo-display',+ contextRef: 'ctx',+ secretRef: '',+ channels: [],+ model: Object.assign(grokModel, { connectionRef: 'team-grok' }),+ },+ },+ { metadata: { resourceVersion: 'rv-form-load' } }+ )+ const brokerSecretResources = await produceHostSecretResources('custom-secret', [+ 'some-custom-key',+ ])+ vi.mocked(api.apiGet).mockImplementation(async path => {+ if (path.endsWith('/connections/team-grok/models')) {+ return { models: [{ model: 'grok-4.6', enabled: true, stale: false }] }+ }+ if (path.includes('/grok-subscription/connections')) {+ return {+ connections: [+ {+ connectionKey: 'team-grok',+ displayName: 'Team Grok',+ status: 'connected',+ credentialRevision: 1,+ catalogRevision: 1,+ accountFingerprint: 'account-fingerprint',+ catalogStatus: 'ready',+ catalogSyncedAt: '2026-09-01T00:00:00.000Z',+ lastRefreshAt: '2026-09-01T00:00:00.000Z',+ lastAuthAt: '2026-09-01T00:00:00.000Z',+ refreshLockHeld: false,+ defaultModel: 'grok-4.6',+ },+ ],+ }+ }+ return { rows: [] }+ })+ vi.mocked(api.getLlmModels).mockResolvedValue({+ rows: [+ {+ id: 'grok-grok-4-6',+ provider: 'grok-subscription',+ model: 'grok-4.6',+ vendor: 'xAI',+ display_name: null,+ context_window_tokens: null,+ enabled: true,+ source: 'manual',+ stale: false,+ created_at: '',+ updated_at: '',+ },+ ...modelCatalogRows,+ ],+ })+ setupApiMocks(brokerHost, brokerHost, brokerSecretResources)+ const view = render(<HostDetailsPage />)+ navigateToTab(view, 'model')+ await screen.findByText('Current model')++ fireEvent.click(screen.getByRole('button', { name: 'Edit' }))+ const dialog = await screen.findByRole('dialog', { name: 'Edit model & credentials' })+ fireEvent.click(within(dialog).getByRole('button', { name: 'Credential' }))+ expect(+ screen+ .getByLabelText('Provider', { selector: '#llm-primary-provider' })+ .querySelector('[data-provider]')+ ).toHaveAttribute('data-provider', 'grok-subscription')+ fireEvent.click(screen.getByRole('option', { name: /custom-secret/ }))++ expect(+ screen+ .getByLabelText('Provider', { selector: '#llm-primary-provider' })+ .querySelector('[data-provider]')+ ).toHaveAttribute('data-provider', 'grok-subscription')+ expect(+ screen.getByLabelText('Current model', { selector: '#llm-primary-model' })+ ).toHaveTextContent('grok-4.6')++ expect(within(dialog).getByRole('button', { name: 'Save' })).toBeEnabled()+ fireEvent.click(within(dialog).getByRole('button', { name: 'Save' }))+ await waitFor(() =>+ expect(api.apiSend).toHaveBeenCalledWith('PUT', '/api/v1/admin/hosts/foo', expect.any(Object))+ )+ const payload = findHostPutPayload() as { spec: Record<string, unknown> }+ expect(payload.spec.model).toEqual({+ provider: 'grok-subscription',+ name: 'grok-4.6',+ connectionRef: 'team-grok',+ })+ })+it('routes the secret editor to the credential picked in the dialog, not the saved one', async () => {setupApiMocks(formLoadHost, refetchedHost, [{ name: 'openai-secret', keys: ['openai-api-key'] },diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex bbe61f2ce..c82016381 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.714",+ "version": "0.1.715","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.714",+ "version": "0.1.715","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 215b5cce3..0dc0b151f 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.714",+ "version": "0.1.715","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",