Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): reject ambiguous connector secret identities
M060dc14db67e
diff --git a/control-ui/app/mcp-servers/[name]/edit/page.tsx b/control-ui/app/mcp-servers/[name]/edit/page.tsxindex 797b10246..ded5ec8d1 100644--- a/control-ui/app/mcp-servers/[name]/edit/page.tsx+++ b/control-ui/app/mcp-servers/[name]/edit/page.tsx@@ -13,6 +13,7 @@ import { TabBar } from '@components/TabBar'import { useToast } from '@components/Toast'import { UpdateConnectorCredentials } from '@components/UpdateConnectorCredentials'import {+ nonCanonicalEnvSecretName,resolveEnvSecret,resolveRegistryCredentialSource,} from '@components/UpdateConnectorCredentials/mcpServerCredentialResolvers'@@ -261,6 +262,9 @@ export default function EditMcpServerPage() {const envSecret = server?.spec? resolveEnvSecret(server.spec as Record<string, unknown>): undefined+ const nonCanonicalSecretName = server?.spec+ ? nonCanonicalEnvSecretName(server.spec as Record<string, unknown>)+ : undefinedconst registryCredentialSource = useMemo(() => resolveRegistryCredentialSource(server?.metadata),[server?.metadata]@@ -326,17 +330,25 @@ export default function EditMcpServerPage() {) : server ? (activeTab === 'credentials' ? (<div className="cu-connector-edit-form">- <UpdateConnectorCredentials- serverName={name}- envSecret={envSecret}- registryCredentialSource={registryCredentialSource}- surface={resolveCredentialSurface(- server.status?.conditions,- server.spec as { managed?: boolean } | undefined- )}- // Ownership is a spec fact, independent of observed status.- recipeOwned={isRecipeOwned(server.spec as { managed?: boolean } | undefined)}- />+ {nonCanonicalSecretName !== undefined ? (+ <div className="cu-banner cu-banner--error" role="alert">+ This connector stores a non-canonical Secret name:{' '}+ <code>{JSON.stringify(nonCanonicalSecretName)}</code>. Correct the connector+ reference before editing credentials.+ </div>+ ) : (+ <UpdateConnectorCredentials+ serverName={name}+ envSecret={envSecret}+ registryCredentialSource={registryCredentialSource}+ surface={resolveCredentialSurface(+ server.status?.conditions,+ server.spec as { managed?: boolean } | undefined+ )}+ // Ownership is a spec fact, independent of observed status.+ recipeOwned={isRecipeOwned(server.spec as { managed?: boolean } | undefined)}+ />+ )}</div>) : activeTab === 'access' ? (<div className="cu-connector-edit-form cu-connector-edit-content">diff --git a/control-ui/app/secrets/connector/[name]/edit/page.tsx b/control-ui/app/secrets/connector/[name]/edit/page.tsxindex 91ab28e7e..d9bdd572c 100644--- a/control-ui/app/secrets/connector/[name]/edit/page.tsx+++ b/control-ui/app/secrets/connector/[name]/edit/page.tsx@@ -10,6 +10,7 @@ import { IconKey } from '@components/Sidebar/icons'import { TabBar } from '@components/TabBar'import { UpdateConnectorCredentials } from '@components/UpdateConnectorCredentials'import {+ nonCanonicalEnvSecretName,resolveEnvSecret,resolveRegistryCredentialSource,} from '@components/UpdateConnectorCredentials/mcpServerCredentialResolvers'@@ -39,7 +40,15 @@ function EditConnectorSecretContent() {return value ?? ''}}, [params])- const requestedServer = (searchParams.get('server') ?? '').trim()+ const serverQueryValues = searchParams.getAll('server')+ const requestedServer = serverQueryValues[0]+ const serverQueryError =+ serverQueryValues.length > 0 &&+ (serverQueryValues.length !== 1 ||+ !requestedServer ||+ requestedServer !== requestedServer.trim())+ ? 'Choose exactly one connector from this Secret. The server link is invalid.'+ : ''const [servers, setServers] = useState<McpServerResource[] | null>(null)const [loadError, setLoadError] = useState('')@@ -54,12 +63,7 @@ function EditConnectorSecretContent() {getMcpServers().then(result => {if (cancelled) return- const attached = (result.items ?? [])- .filter(server => serverRefersToSecret(server, secretName))- .sort((a, b) =>- String(a.metadata?.name ?? '').localeCompare(String(b.metadata?.name ?? ''))- )- setServers(attached)+ setServers(result.items ?? [])}).catch(error => {if (!cancelled) {@@ -74,12 +78,56 @@ function EditConnectorSecretContent() {}}, [secretName])+ const attachedServers = useMemo(+ () =>+ (servers ?? [])+ .filter(server => serverRefersToSecret(server, secretName))+ .sort((a, b) =>+ String(a.metadata?.name ?? '').localeCompare(String(b.metadata?.name ?? ''))+ ),+ [servers, secretName]+ )+ const nonCanonicalReferences = useMemo(+ () =>+ (servers ?? [])+ .map(server => ({+ connector: String(server.metadata?.name ?? ''),+ name: nonCanonicalEnvSecretName(server.spec as Record<string, unknown> | undefined),+ }))+ .filter(ref => ref.name !== undefined && ref.name.trim() === secretName.trim()),+ [servers, secretName]+ )+ const identityError =+ secretName !== secretName.trim()+ ? `Secret name in the URL is non-canonical: ${JSON.stringify(secretName)}. Correct the connector reference before editing credentials.`+ : nonCanonicalReferences.length > 0+ ? `Connector ${nonCanonicalReferences.map(ref => ref.connector).join(', ')} stores a non-canonical Secret name: ${nonCanonicalReferences.map(ref => JSON.stringify(ref.name)).join(', ')}. Correct the connector reference before editing credentials.`+ : ''+ const unknownServerError =+ servers !== null &&+ !loadError &&+ !identityError &&+ !serverQueryError &&+ serverQueryValues.length === 1 &&+ !attachedServers.some(server => server.metadata?.name === requestedServer)+ ? `Connector ${requestedServer} does not reference this Secret. Choose a connector that does.`+ : ''+const selected = useMemo(() => {- if (!servers || servers.length === 0) return undefined- return requestedServer- ? servers.find(s => String(s.metadata?.name ?? '') === requestedServer)- : servers[0]- }, [servers, requestedServer])+ if (serverQueryError || unknownServerError || identityError || attachedServers.length === 0) {+ return undefined+ }+ return serverQueryValues.length === 1+ ? attachedServers.find(s => String(s.metadata?.name ?? '') === requestedServer)+ : attachedServers[0]+ }, [+ attachedServers,+ identityError,+ requestedServer,+ serverQueryError,+ serverQueryValues.length,+ unknownServerError,+ ])const selectedName = selected ? String(selected.metadata?.name ?? '') : ''const selectedEnvSecret = selected? resolveEnvSecret(selected.spec as Record<string, unknown> | undefined)@@ -108,24 +156,43 @@ function EditConnectorSecretContent() {{loadError}</div>) : null}+ {identityError ? (+ <div className="cu-banner cu-banner--error" role="alert">+ {identityError}+ </div>+ ) : null}+ {serverQueryError ? (+ <div className="cu-banner cu-banner--error" role="alert">+ {serverQueryError}+ </div>+ ) : null}+ {unknownServerError ? (+ <div className="cu-banner cu-banner--error" role="alert">+ {unknownServerError}+ </div>+ ) : null}{servers === null ? (<p className="cu-muted" role="status">Loading attached connectors…</p>- ) : servers.length === 0 && !loadError ? (+ ) : attachedServers.length === 0 &&+ !loadError &&+ !identityError &&+ !serverQueryError &&+ !unknownServerError ? (<div className="cu-banner cu-banner--error">No connector currently references Secret <code>{secretName || '(unnamed)'}</code>.Attach it to a connector before rotating it from here.</div>) : (<>- {servers.length > 1 ? (+ {attachedServers.length > 1 ? (<TabBaractiveValue={selectedName}ariaLabel="Connectors referencing this secret"className="cu-tabs--flush"- options={servers.map(server => {+ options={attachedServers.map(server => {const name = String(server.metadata?.name ?? '')return {value: name,@@ -136,13 +203,6 @@ function EditConnectorSecretContent() {/>) : null}- {requestedServer && !selected ? (- <div className="cu-banner cu-banner--error" role="alert">- Connector <code>{requestedServer}</code> does not reference this Secret. Choose- a connector that does.- </div>- ) : null}-{selected && !secretMatches ? (<div className="cu-banner cu-banner--error" role="alert">This connector does not reference Secret <code>{secretName}</code>. Choose adiff --git a/control-ui/components/SecretsTable.tsx b/control-ui/components/SecretsTable.tsxindex a80ee2c67..a434e29bc 100644--- a/control-ui/components/SecretsTable.tsx+++ b/control-ui/components/SecretsTable.tsx@@ -49,10 +49,7 @@ type McpSecretRow = {}type RecipeSecretStatus = 'provisioned' | 'missing'type RecipeSecretRowOwnership =- | { kind: 'shared' }- | { kind: 'owner-recipe'; recipeName: string }- | { kind: 'unlabeled' }- | null // missing rows: not yet provisioned, ownership chosen at create time.+ { kind: 'shared' } | { kind: 'owner-recipe'; recipeName: string } | { kind: 'unlabeled' } | null // missing rows: not yet provisioned, ownership chosen at create time.type RecipeSecretRow = {name: stringnamespace: string@@ -231,7 +228,7 @@ export function SecretsTable({const serverName = typeof metadata.name === 'string' ? metadata.name.trim() : ''const spec = (item.spec ?? {}) as Record<string, unknown>const envSecret = (spec.envSecret ?? {}) as Record<string, unknown>- const secretName = typeof envSecret.name === 'string' ? String(envSecret.name).trim() : ''+ const secretName = typeof envSecret.name === 'string' ? envSecret.name : ''if (!secretName) continueconst row = addSecret(secretName)@@ -672,7 +669,13 @@ export function SecretsTable({) : (mcpSort.sortedRows.map(row => (<tr key={row.name}>- <td>{row.name}</td>+ <td>+ {row.name === row.name.trim() ? (+ row.name+ ) : (+ <code>{JSON.stringify(row.name)}</code>+ )}+ </td><td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>{row.servers.length > 0? `${row.servers.length} server(s): ${row.servers.join(', ')}`@@ -691,6 +694,8 @@ export function SecretsTable({{key: 'add',label: 'Add',+ disabled: row.name !== row.name.trim(),+ disabledReason: 'The connector stores a non-canonical Secret name.',onClick: () => {const source =row.registrySources.length === 1diff --git a/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts b/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.tsindex 34a9091e1..3ed9867a2 100644--- a/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts+++ b/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts@@ -1,5 +1,14 @@import type { EnvSecret, EnvSecretKeyMapping, McpServerResource } from '@lib/api'+export function nonCanonicalEnvSecretName(+ spec: Record<string, unknown> | undefined+): string | undefined {+ const raw = spec?.envSecret+ if (!raw || typeof raw !== 'object') return undefined+ const name = (raw as { name?: unknown }).name+ return typeof name === 'string' && name !== name.trim() ? name : undefined+}+/*** Narrows `server.spec.envSecret` (typed as `unknown` on the generic* `AnyRecord` spec) into the shape UpdateConnectorCredentials needs. A@@ -12,8 +21,7 @@ export function resolveEnvSecret(spec: Record<string, unknown> | undefined): Envif (!raw || typeof raw !== 'object') return undefinedconst candidate = raw as { name?: unknown; keys?: unknown }if (typeof candidate.name !== 'string' || !Array.isArray(candidate.keys)) return undefined- const name = candidate.name.trim()- if (!name) return undefined+ if (!candidate.name || nonCanonicalEnvSecretName(spec) !== undefined) return undefinedconst keys = candidate.keys.filter((k): k is EnvSecretKeyMapping =>Boolean(k) &&@@ -21,7 +29,7 @@ export function resolveEnvSecret(spec: Record<string, unknown> | undefined): Envtypeof (k as EnvSecretKeyMapping).envVar === 'string')if (keys.length === 0) return undefined- return { name, keys }+ return { name: candidate.name, keys }}/**diff --git a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsxindex 34b471fa4..5d28765ad 100644--- a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx+++ b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx@@ -12,7 +12,7 @@ import {getRegistryCredentialSchema,updateMcpSecret,} from '../../lib/api'-import type { McpServerResource } from '../../lib/api'+import { buildMcpServerReference } from '../../test/fixtures/mcpServer'// These tests prove the PAGE wiring: the rotation form, its rollout// verification, and the 404→recreate latch all belong to the shared@@ -59,28 +59,15 @@ function server(options: {secretName?: stringsecretKey?: stringenvVar?: string-}): McpServerResource {- return {- metadata: {- name: options.name,- annotations: {- 'clerum.io/catalog-id': 'mcp-linear',- 'clerum.io/catalog-version': '1.4.0',- },+}) {+ return buildMcpServerReference({+ ...options,+ secretName: options.secretName ?? 'linear-credentials',+ annotations: {+ 'clerum.io/catalog-id': 'mcp-linear',+ 'clerum.io/catalog-version': '1.4.0',},- spec: {- envSecret: {- name: options.secretName ?? 'linear-credentials',- keys: [- {- secretKey: options.secretKey ?? 'api-key',- envVar: options.envVar ?? 'LINEAR_API_KEY',- },- ],- },- },- status: { conditions: [] },- }+ })}/** Drains chained microtasks without real timers — same contract as the@@ -189,32 +176,34 @@ describe('EditConnectorSecretPage', () => {).toBeInTheDocument()})- it('uses the normalized Secret name for selection and rotation', async () => {+ it('refuses a non-canonical stored Secret name without rotating its trimmed alias', async () => {mockGetMcpServers.mockResolvedValue({items: [server({ name: 'linear-conn', secretName: ' linear-credentials ' })],})await renderPage()- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()- await submitRotation('API token', 'rotated')-- expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {- 'api-key': 'rotated',- })- expect(mockUpdateMcpSecret).not.toHaveBeenCalledWith(' linear-credentials ', {- 'api-key': 'rotated',- })+ expect(screen.getByRole('alert').textContent).toContain(+ 'Connector linear-conn stores a non-canonical Secret name: " linear-credentials "'+ )+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()+ expect(screen.queryByLabelText('API token')).not.toBeInTheDocument()+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ expect(mockCreateMcpSecret).not.toHaveBeenCalled()})- it('refuses rotation when the normalized connector Secret name differs from the URL', async () => {+ it('refuses the raw non-canonical Secret identity linked from the table', async () => {+ navigation.params = { name: ' linear-credentials ' }mockGetMcpServers.mockResolvedValue({- items: [server({ name: 'linear-conn', secretName: ' other-credentials ' })],+ items: [server({ name: 'linear-conn', secretName: ' linear-credentials ' })],})await renderPage()- expect(screen.getByText(/No connector currently references Secret/i)).toBeInTheDocument()+ expect(screen.getByRole('alert').textContent).toContain(+ 'Secret name in the URL is non-canonical: " linear-credentials "'+ )expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ expect(mockCreateMcpSecret).not.toHaveBeenCalled()})it('latches to recreate mode when the rotation PUT answers 404', async () => {@@ -263,20 +252,37 @@ describe('EditConnectorSecretPage', () => {expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()})- it('does not rotate through a different connector when a deep link names an unattached server', async () => {- navigation.searchParams = new URLSearchParams('?server=stale-conn')+ it.each([+ ['empty', '?server='],+ ['whitespace-only', '?server=%20%20'],+ ['duplicate', '?server=alpha-conn&server=linear-conn'],+ ['unknown', '?server=stale-conn'],+ ])('rejects an %s server query without a credential form', async (_, query) => {+ navigation.searchParams = new URLSearchParams(query)mockGetMcpServers.mockResolvedValue({items: [server({ name: 'alpha-conn' }), server({ name: 'linear-conn' })],})await renderPage()+ expect(screen.getByRole('alert')).toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()+ expect(screen.queryByLabelText('API token')).not.toBeInTheDocument()+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ expect(mockCreateMcpSecret).not.toHaveBeenCalled()+ })++ it('rejects an unknown server even when no connectors reference the Secret', async () => {+ navigation.searchParams = new URLSearchParams('?server=stale-conn')+ mockGetMcpServers.mockResolvedValue({ items: [] })+ await renderPage()+expect(screen.getByRole('alert')).toHaveTextContent('Connector stale-conn does not reference this Secret.')expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()- expect(screen.queryByLabelText('API token')).not.toBeInTheDocument()expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ expect(mockCreateMcpSecret).not.toHaveBeenCalled()})it('explains when no connector currently references the secret', async () => {diff --git a/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx b/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsxindex 58ea7cb59..b8b4ca43c 100644--- a/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx+++ b/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx@@ -89,6 +89,7 @@ const CONNECTOR_IMAGE = 'ghcr.io/acme/linear-mcp:1.4.0'function mcpServer(options: {managed?: booleanstatus?: { conditions?: McpServerCondition[] }+ secretName?: string}): McpServerResource {return {metadata: { name: SERVER_NAME, namespace: NAMESPACE },@@ -97,7 +98,7 @@ function mcpServer(options: {contextRef: 'default',...(options.managed === undefined ? {} : { managed: options.managed }),envSecret: {- name: SECRET_NAME,+ name: options.secretName ?? SECRET_NAME,keys: [{ secretKey: 'api-key', envVar: 'LINEAR_API_KEY' },{ secretKey: 'workspace-id', envVar: 'LINEAR_WORKSPACE' },@@ -196,6 +197,23 @@ afterEach(() => {vi.clearAllMocks()})+it('shows an error instead of a credential form for a non-canonical Secret reference', async () => {+ mockGetMcpServer.mockResolvedValue(+ mcpServer({ secretName: ' linear-credentials ', status: { conditions: [] } })+ )+ render(+ <ToastProvider>+ <EditMcpServerPage />+ </ToastProvider>+ )++ expect((await screen.findByRole('alert')).textContent).toContain('" linear-credentials "')+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'Set credentials' })).not.toBeInTheDocument()+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ expect(mockCreateMcpSecret).not.toHaveBeenCalled()+})+// ─── R1-H2 / mini-spec §1: ownership is a function of `spec` alone ─────────//// Invariant O1: `recipeOwned === (spec.managed === false)`, never a function ofdiff --git a/control-ui/components/__tests__/SecretsTable.test.tsx b/control-ui/components/__tests__/SecretsTable.test.tsxindex ac5c0691c..0ebacc130 100644--- a/control-ui/components/__tests__/SecretsTable.test.tsx+++ b/control-ui/components/__tests__/SecretsTable.test.tsx@@ -15,6 +15,7 @@ import {getRecipeSecrets,getRecipes,} from '../../lib/api'+import { buildMcpServerReference } from '../../test/fixtures/mcpServer'import { buildSecretSummary } from '../../test/fixtures/secretSummary'import { SecretsTable } from '../SecretsTable'import { ToastProvider } from '../Toast'@@ -309,20 +310,18 @@ describe('SecretsTable — connector marketplace source', () => {it('derives registryEntries from catalog-id/version ANNOTATIONS (org-scoped install)', async () => {getMcpServersMock.mockResolvedValue({items: [- {- metadata: {- name: 'newtenantwf-conn',- annotations: {- 'clerum.io/catalog-id': '@newtenantwf/conn',- 'clerum.io/catalog-version': '1.0.0',- },- labels: {- 'clerum.io/managed-by': 'control-api',- 'clerum.io/server-mode': 'local',- },+ buildMcpServerReference({+ name: 'newtenantwf-conn',+ secretName: 'newtenantwf-conn-credentials',+ annotations: {+ 'clerum.io/catalog-id': '@newtenantwf/conn',+ 'clerum.io/catalog-version': '1.0.0',},- spec: { envSecret: { name: 'newtenantwf-conn-credentials' } },- },+ labels: {+ 'clerum.io/managed-by': 'control-api',+ 'clerum.io/server-mode': 'local',+ },+ }),],})@@ -336,17 +335,15 @@ describe('SecretsTable — connector marketplace source', () => {it('still derives registryEntries from LABELS for legacy (pre-annotation) installs', async () => {getMcpServersMock.mockResolvedValue({items: [- {- metadata: {- name: 'legacy-conn',- labels: {- 'clerum.io/catalog-id': 'mcp-filesystem',- 'clerum.io/catalog-version': '2.3.0',- 'clerum.io/managed-by': 'control-api',- },+ buildMcpServerReference({+ name: 'legacy-conn',+ secretName: 'legacy-conn-credentials',+ labels: {+ 'clerum.io/catalog-id': 'mcp-filesystem',+ 'clerum.io/catalog-version': '2.3.0',+ 'clerum.io/managed-by': 'control-api',},- spec: { envSecret: { name: 'legacy-conn-credentials' } },- },+ }),],})@@ -360,21 +357,19 @@ describe('SecretsTable — connector marketplace source', () => {it('prefers ANNOTATIONS over LABELS when both are present', async () => {getMcpServersMock.mockResolvedValue({items: [- {- metadata: {- name: 'both-conn',- annotations: {- 'clerum.io/catalog-id': '@org/new',- 'clerum.io/catalog-version': '9.9.9',- },- labels: {- 'clerum.io/catalog-id': 'stale',- 'clerum.io/catalog-version': '0.0.1',- 'clerum.io/managed-by': 'control-api',- },+ buildMcpServerReference({+ name: 'both-conn',+ secretName: 'both-conn-credentials',+ annotations: {+ 'clerum.io/catalog-id': '@org/new',+ 'clerum.io/catalog-version': '9.9.9',},- spec: { envSecret: { name: 'both-conn-credentials' } },- },+ labels: {+ 'clerum.io/catalog-id': 'stale',+ 'clerum.io/catalog-version': '0.0.1',+ 'clerum.io/managed-by': 'control-api',+ },+ }),],})@@ -620,16 +615,14 @@ describe('SecretsTable — connector row actions', () => {function mockConnectorRow() {getMcpServersMock.mockResolvedValue({items: [- {- metadata: {- name: 'linear-conn',- annotations: {- 'clerum.io/catalog-id': 'mcp-linear',- 'clerum.io/catalog-version': '1.4.0',- },+ buildMcpServerReference({+ name: 'linear-conn',+ secretName: 'linear-credentials',+ annotations: {+ 'clerum.io/catalog-id': 'mcp-linear',+ 'clerum.io/catalog-version': '1.4.0',},- spec: { envSecret: { name: 'linear-credentials' } },- },+ }),],})}@@ -679,14 +672,8 @@ describe('SecretsTable — connector row actions', () => {it('navigates Update without a server filter when several connectors share the secret', async () => {getMcpServersMock.mockResolvedValue({items: [- {- metadata: { name: 'conn-a' },- spec: { envSecret: { name: 'shared-credentials' } },- },- {- metadata: { name: 'conn-b' },- spec: { envSecret: { name: 'shared-credentials' } },- },+ buildMcpServerReference({ name: 'conn-a', secretName: 'shared-credentials' }),+ buildMcpServerReference({ name: 'conn-b', secretName: 'shared-credentials' }),],})renderTable()@@ -699,6 +686,34 @@ describe('SecretsTable — connector row actions', () => {expect(mockPush).toHaveBeenCalledWith('/secrets/connector/shared-credentials/edit')})+ it('keeps a non-canonical Secret reference distinct from its trimmed name', async () => {+ getMcpServersMock.mockResolvedValue({+ items: [+ buildMcpServerReference({ name: 'canonical-conn', secretName: 'linear-credentials' }),+ buildMcpServerReference({ name: 'stale-conn', secretName: ' linear-credentials ' }),+ ],+ })+ renderTable()++ const malformedIdentity = await screen.findByText(+ (_, element) =>+ element?.tagName === 'CODE' && element.textContent === '" linear-credentials "'+ )+ const malformedRow = malformedIdentity.closest('tr')!+ const canonicalRow = screen.getByText('linear-credentials').closest('tr')!+ expect(within(malformedRow).getByText('1 server(s): stale-conn')).toBeInTheDocument()+ expect(within(canonicalRow).getByText('1 server(s): canonical-conn')).toBeInTheDocument()+ expect(within(canonicalRow).queryByText(/stale-conn/)).not.toBeInTheDocument()++ fireEvent.click(within(malformedRow).getByRole('button'))+ expect(screen.getByRole('menuitem', { name: /^Add/ })).toHaveAttribute('aria-disabled', 'true')+ fireEvent.click(screen.getByRole('menuitem', { name: 'Update' }))+ expect(mockPush).toHaveBeenCalledWith(+ '/secrets/connector/%20%20linear-credentials%20%20/edit?server=stale-conn'+ )+ expect(apiSendMock).not.toHaveBeenCalled()+ })+it('still prefills the create flow from the row Add action', async () => {mockConnectorRow()renderTable()diff --git a/control-ui/components/__tests__/UpdateConnectorCredentials.test.tsx b/control-ui/components/__tests__/UpdateConnectorCredentials.test.tsxindex 394dbfd2b..374cbe171 100644--- a/control-ui/components/__tests__/UpdateConnectorCredentials.test.tsx+++ b/control-ui/components/__tests__/UpdateConnectorCredentials.test.tsx@@ -15,6 +15,7 @@ import {updateMcpSecret,} from '@lib/api'import type { EnvSecret, McpServerResource } from '@lib/api'+import { buildMcpServerReference } from '../../test/fixtures/mcpServer'vi.mock('@lib/api', () => ({getMcpServer: vi.fn(),@@ -257,6 +258,27 @@ describe('UpdateConnectorCredentials — masked inputs', () => {})describe('UpdateConnectorCredentials — partial payload', () => {+ it('previews only connectors with the exact Secret reference', async () => {+ mockGetMcpServers.mockResolvedValue({+ items: [+ buildMcpServerReference({ name: SERVER_NAME, secretName: ENV_SECRET.name }),+ buildMcpServerReference({+ name: 'stale-connector',+ secretName: ` ${ENV_SECRET.name} `,+ }),+ ],+ })+ await renderPanel(ENV_SECRET)++ fireEvent.change(screen.getByLabelText('api-key'), { target: { value: 'new-key-value' } })+ fireEvent.click(screen.getByRole('button', { name: 'Rotate credentials' }))++ const dialog = screen.getByRole('alertdialog')+ expect(dialog).toHaveTextContent(`restarts: ${SERVER_NAME}.`)+ expect(dialog).not.toHaveTextContent('stale-connector')+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ })+it('sends only the filled keys, never the untouched ones', async () => {mockUpdateMcpSecret.mockResolvedValue({name: ENV_SECRET.name,diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex ccb1960d9..efd02254b 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.655",+ "version": "0.1.656","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.655",+ "version": "0.1.656","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 349558be4..7b96cf2d8 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.655",+ "version": "0.1.656","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",diff --git a/control-ui/test/fixtures/mcpServer.ts b/control-ui/test/fixtures/mcpServer.tsnew file mode 100644index 000000000..a3ae23660--- /dev/null+++ b/control-ui/test/fixtures/mcpServer.ts@@ -0,0 +1,38 @@+import type { McpServerResource } from '../../lib/api'++/** Mirrors the McpServer written by the registry install producer: the Secret+ * reference always carries both its name and declared key-to-env mappings. */+export function buildMcpServerReference(options: {+ name: string+ secretName: string+ secretKey?: string+ envVar?: string+ annotations?: Record<string, string>+ labels?: Record<string, string>+}): McpServerResource {+ return {+ metadata: {+ name: options.name,+ namespace: 'mcp-server',+ ...(options.annotations ? { annotations: options.annotations } : {}),+ ...(options.labels ? { labels: options.labels } : {}),+ },+ spec: {+ image: 'ghcr.io/acme/linear-mcp:1.4.0',+ contextRef: 'default',+ enabled: true,+ managed: true,+ transport: { type: 'streamableHttp', port: 3000 },+ envSecret: {+ name: options.secretName,+ keys: [+ {+ secretKey: options.secretKey ?? 'api-key',+ envVar: options.envVar ?? 'LINEAR_API_KEY',+ },+ ],+ },+ },+ status: { conditions: [] },+ }+}