Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-ui): keep Codex grants inside the shared LLM Secret picker

Alfredo Lopezd34b7d520662
diff --git a/control-ui/app/hosts/[name]/page.tsx b/control-ui/app/hosts/[name]/page.tsx
index a562ad1b8..7e69842c8 100644
--- a/control-ui/app/hosts/[name]/page.tsx
+++ b/control-ui/app/hosts/[name]/page.tsx
@@ -19,7 +19,7 @@ import { LlmSecretSelect } from '../../../components/LlmSecretSelect'
import { LlmSecretUpdateModal } from '../../../components/LlmSecretUpdateModal'
import { RowActionsMenu } from '../../../components/RowActionsMenu'
import { IconRobot } from '../../../components/Sidebar/icons'
-import { IconCheck, IconMoreHorizontal, IconPencil, IconX } from '../../../components/icons'
+import { IconMoreHorizontal, IconPencil, IconX } from '../../../components/icons'
import {
apiSend,
getHost,
@@ -195,7 +195,6 @@ export default function HostDetailsPage() {
const [editingModel, setEditingModel] = useState(false)
const [llmSecretModalOpen, setLlmSecretModalOpen] = useState(false)
- const [editingContext, setEditingContext] = useState(false)
const [showDeleteAgentConfirm, setShowDeleteAgentConfirm] = useState(false)
const [deletingAgent, setDeletingAgent] = useState(false)
const [deleteAgentDialogError, setDeleteAgentDialogError] = useState('')
@@ -678,10 +677,45 @@ export default function HostDetailsPage() {
if (secretRefDraft.trim() && !options.some(secret => secret.value === secretRefDraft.trim())) {
options.unshift(toOption(secretRefDraft.trim(), currentSecretKeys))
}
+ for (const row of codexConnections.filter(item => item.status !== 'revoked')) {
+ options.push({
+ group: 'ChatGPT subscriptions',
+ value: credentialSelectValue('', row.connectionKey),
+ label: row.displayName || row.connectionKey,
+ meta: 'ChatGPT subscription',
+ providers: [{ id: 'codex-subscription', label: 'ChatGPT' }],
+ })
+ }
+ if (
+ connectionRefDraft &&
+ connectionRefDraft !== CODEX_UNASSIGNED_CONNECTION_KEY &&
+ !codexConnections.some(
+ row => row.connectionKey === connectionRefDraft && row.status !== 'revoked'
+ )
+ ) {
+ options.push({
+ group: 'ChatGPT subscriptions',
+ value: credentialSelectValue('', connectionRefDraft),
+ label: `${connectionRefDraft} (unavailable)`,
+ meta: 'ChatGPT subscription',
+ providers: [{ id: 'codex-subscription', label: 'ChatGPT' }],
+ })
+ }
return options
- }, [availableLlmSecrets, currentSecretKeys, secretRefDraft])
+ }, [availableLlmSecrets, codexConnections, connectionRefDraft, currentSecretKeys, secretRefDraft])
+
+ const chainRequiresSecret = llmChainRequiresSecret(providerDraft, llmPolicyDraft?.fallbacks)
+ const isCodexAssignment = providerDraft === 'codex-subscription'
+ const isCodexUnassigned =
+ isCodexAssignment &&
+ (!connectionRefDraft.trim() || connectionRefDraft === CODEX_UNASSIGNED_CONNECTION_KEY)
+ const assignedCodexLabel =
+ codexConnections.find(row => row.connectionKey === connectionRefDraft)?.displayName ||
+ connectionRefDraft
+ const credentialFieldLabel = isCodexAssignment ? 'Credential' : 'LLM Secret'
const linkedSecretProviderMismatch =
+ chainRequiresSecret &&
secretRefDraft.trim().length > 0 &&
currentSecretKeys.length > 0 &&
!isProviderUsable(providerDraft, key => currentSecretKeys.includes(key))
@@ -913,6 +947,10 @@ export default function HostDetailsPage() {
: {}),
},
}
+ // Host identity is metadata.name / the route slug. Never persist
+ // hostRef/userId as execution authority on this write.
+ delete nextSpec.hostRef
+ delete nextSpec.userId
// These fields are owned by this editor. Delete them first so removing
// the last fallback or clearing an allowlist is persisted as an actual
// field removal under the facade's full-replace semantics.
@@ -1137,70 +1175,33 @@ export default function HostDetailsPage() {
<div className="cu-form-stack">
<div className="cu-field">
- <label htmlFor="model-secret">Credential</label>
+ <label htmlFor="model-secret">{credentialFieldLabel}</label>
<div className="cu-llm-secret-control">
- {editingModel ? (
- <select
- id="model-secret"
- className="cu-select"
- aria-label="Credential"
- value={credentialSelectValue(secretRefDraft, connectionRefDraft)}
- onChange={event => handleCredentialChange(event.target.value)}
- disabled={busy}
- >
- <option value="">Select a credential…</option>
- {llmSecretOptions.map(option => (
- <option key={option.value} value={credentialSelectValue(option.value, '')}>
- {option.label}
- </option>
- ))}
- {codexConnections.some(row => row.status !== 'revoked') ||
- (connectionRefDraft &&
- connectionRefDraft !== CODEX_UNASSIGNED_CONNECTION_KEY) ? (
- <optgroup label="ChatGPT subscriptions">
- {codexConnections
- .filter(row => row.status !== 'revoked')
- .map(row => (
- <option
- key={row.connectionKey}
- value={credentialSelectValue('', row.connectionKey)}
- >
- {row.displayName || row.connectionKey}
- </option>
- ))}
- {connectionRefDraft &&
- connectionRefDraft !== CODEX_UNASSIGNED_CONNECTION_KEY &&
- !codexConnections.some(
- row =>
- row.connectionKey === connectionRefDraft && row.status !== 'revoked'
- ) ? (
- <option value={credentialSelectValue('', connectionRefDraft)}>
- {connectionRefDraft} (unavailable)
- </option>
- ) : null}
- </optgroup>
- ) : null}
- </select>
- ) : (
- <LlmSecretSelect
- id="model-secret"
- value={secretRefDraft}
- ariaLabel="Credential"
- onChange={value => void handleSecretRefChange(value)}
- options={llmSecretOptions}
- placeholder={
- providerDraft === 'codex-subscription'
- ? connectionRefDraft === CODEX_UNASSIGNED_CONNECTION_KEY
- ? 'No ChatGPT subscription assigned'
- : codexConnections.find(row => row.connectionKey === connectionRefDraft)
- ?.displayName || connectionRefDraft
- : llmSecretOptions.length === 0
- ? 'No LLM Secret available'
- : 'Select an LLM Secret...'
+ <LlmSecretSelect
+ id="model-secret"
+ value={credentialSelectValue(secretRefDraft, connectionRefDraft)}
+ ariaLabel={credentialFieldLabel}
+ onChange={value => {
+ if (!editingModel && parseCredentialSelect(value).kind === 'secret') {
+ void handleSecretRefChange(value)
+ return
}
- disabled={busy || providerDraft === 'codex-subscription'}
- />
- )}
+ handleCredentialChange(value)
+ }}
+ options={llmSecretOptions}
+ placeholder={
+ isCodexAssignment
+ ? isCodexUnassigned
+ ? 'No credential assigned'
+ : assignedCodexLabel
+ : llmSecretOptions.filter(
+ option => !option.group || option.group === 'API keys'
+ ).length === 0
+ ? 'No LLM Secret available'
+ : 'Select an LLM Secret...'
+ }
+ disabled={busy}
+ />
<button
type="button"
className="cu-btn cu-btn--icon cu-btn--toolbar"
@@ -1232,6 +1233,11 @@ export default function HostDetailsPage() {
onPrimaryChange={next => {
setProviderDraft(next.provider)
setModelNameDraft(next.model)
+ if (next.provider !== 'codex-subscription') {
+ setConnectionRefDraft(CODEX_UNASSIGNED_CONNECTION_KEY)
+ setCodexModels([])
+ setGrantCatalogError('')
+ }
}}
policy={llmPolicyDraft}
onPolicyChange={setLlmPolicyDraft}
diff --git a/control-ui/components/HostWizard/index.tsx b/control-ui/components/HostWizard/index.tsx
index fe9b30b1a..b5abe173d 100644
--- a/control-ui/components/HostWizard/index.tsx
+++ b/control-ui/components/HostWizard/index.tsx
@@ -1,16 +1,16 @@
'use client'
-import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { CreateFlowPanel } from '@/components/CreateFlowPanel'
import { CreateStepFlow } from '@/components/CreateStepFlow'
import { LlmProviderConfig } from '@/components/LlmProviderConfig'
-import { LlmProviderIcon } from '@/components/LlmProviderIcon'
+import { LlmSecretSelect } from '@/components/LlmSecretSelect'
import { SelectionDropdown } from '@/components/SelectionDropdown'
import { useToast } from '@/components/Toast'
import { IconAlertTriangle, IconCheck, IconX } from '@/components/icons'
import { Button, CheckboxField, Field, TextInput } from '@/components/ui'
+import { createAgentContextName } from '@/lib/agentContext'
import {
- apiGet,
apiSend,
getAdminTeams,
getAdminUsers,
@@ -54,13 +54,7 @@ import {
STEPS,
STEP_DETAILS,
} from './constants'
-import type {
- ContextOption,
- CreatedResource,
- HostLlmSecretMode,
- HostWizardProps,
- WizardSelectProps,
-} from './types'
+import type { CreatedResource, HostWizardProps, HostWizardValidationState } from './types'
// Stateless lifecycle support remains intact in the API and existing-agent UI;
// only creation through this wizard is temporarily unavailable.
@@ -73,105 +67,6 @@ function primaryCredentialUsable(provider: LlmProvider, draft: Record<string, st
return isProviderUsable(provider, key => (draft[key] ?? '').trim().length > 0)
}
-function WizardSelect({
- className,
- disabled,
- onChange,
- options,
- placeholder,
- value,
-}: WizardSelectProps) {
- const [open, setOpen] = useState(false)
- const selectedOption = options.find(option => option.value === value)
-
- return (
- <div
- className={cn('cu-agent-select', className)}
- onBlur={event => {
- if (!event.currentTarget.contains(event.relatedTarget)) {
- setOpen(false)
- }
- }}
- >
- <button
- type="button"
- className="cu-agent-select__button"
- aria-expanded={open}
- aria-haspopup="listbox"
- disabled={disabled}
- onClick={() => setOpen(prev => !prev)}
- >
- <span className="cu-agent-select__button-copy">
- <span>{selectedOption?.label || placeholder}</span>
- {selectedOption?.providers && selectedOption.providers.length > 0 ? (
- <span className="cu-agent-select__providers">
- <span className="cu-agent-select__providers-label">Providers: </span>
- {selectedOption.providers.map((provider, index) => (
- <Fragment key={provider.id}>
- {index > 0 ? ', ' : null}
- <span className="cu-agent-select__provider">
- <LlmProviderIcon provider={provider.id} label={provider.label} />
- <span>{provider.label}</span>
- </span>
- </Fragment>
- ))}
- </span>
- ) : selectedOption?.meta ? (
- <span className="cu-agent-select__button-meta">{selectedOption.meta}</span>
- ) : null}
- </span>
- <span className="cu-agent-select__chevron" aria-hidden="true" />
- </button>
- {open ? (
- <div className="cu-agent-select__menu" role="listbox">
- {options.length === 0 ? (
- <span className="cu-agent-select__empty">No options available.</span>
- ) : (
- options.map((option, index) => (
- <Fragment key={option.value}>
- {option.group && option.group !== options[index - 1]?.group ? (
- <span className="cu-agent-select__empty">{option.group}</span>
- ) : null}
- <button
- type="button"
- className="cu-agent-select__option"
- data-active={value === option.value ? 'true' : 'false'}
- role="option"
- aria-selected={value === option.value}
- onClick={() => {
- onChange(option.value)
- setOpen(false)
- }}
- >
- <span className="cu-agent-select__option-copy">
- <span className="cu-agent-select__option-name">{option.label}</span>
- {option.providers && option.providers.length > 0 ? (
- <span className="cu-agent-select__providers">
- <span className="cu-agent-select__providers-label">Providers: </span>
- {option.providers.map((provider, index) => (
- <Fragment key={provider.id}>
- {index > 0 ? ', ' : null}
- <span className="cu-agent-select__provider">
- <LlmProviderIcon provider={provider.id} label={provider.label} />
- <span>{provider.label}</span>
- </span>
- </Fragment>
- ))}
- </span>
- ) : option.meta ? (
- <span className="cu-agent-select__option-meta">{option.meta}</span>
- ) : null}
- </span>
- </button>
- </Fragment>
- ))
- )}
- </div>
- ) : null}
- </div>
- )
-}
-
// The DELETE path for one tracked sibling. The server fixes each resource's
// namespace (secrets → config.secretsNamespace; hosts/contexts/channels →
// their configured namespace), so — exactly like the SecretsTable /
@@ -230,6 +125,13 @@ async function compensateCreated(created: CreatedResource[]): Promise<void> {
// Discriminate on `body.code` (the field INSIDE the JSON body), never on the
// client's `.code` (which formatApiError sets from `body.error`, the message).
// Any non-409 error is re-thrown verbatim.
+class ResourceNameCollisionError extends Error {
+ constructor(message: string) {
+ super(message)
+ this.name = 'ResourceNameCollisionError'
+ }
+}
+
async function createOrThrow(path: string, body: unknown, collisionMessage: string): Promise<void> {
try {
await apiSend('POST', path, body)
@@ -238,56 +140,68 @@ async function createOrThrow(path: string, body: unknown, collisionMessage: stri
const errBody = (e as Error & { body?: { code?: unknown } }).body
const hasCode = typeof errBody?.code === 'string' && errBody.code.length > 0
// Code-less 409 from a create-only POST = unambiguous name collision.
- if (!hasCode) throw new Error(collisionMessage)
+ if (!hasCode) throw new ResourceNameCollisionError(collisionMessage)
// Coded 409 (CRD-outdated) keeps the server's own message (e.message).
}
throw e
}
}
-function isStepValid(
- stepIndex: number,
- state: {
- hostName: string
- contextMode: 'existing' | 'new'
- contextName: string
- selectedExistingContext: string
- selectedMcp: string[]
- secretMode: HostLlmSecretMode
- existingSecret: string
- existingLlmSecret: string
- newSecretName: string
- llmKeyDraft: Record<string, string>
- llmPolicy: LlmPolicy | undefined
- provider: LlmProvider
- modelName: string
- connectionRef?: string
- codexModels?: string[]
- selectedUserIds: string[]
- selectedTeamIds: string[]
- directoryLoadFailed: boolean
+async function createPrivateContext(
+ agentName: string,
+ selectedMcpServers: string[],
+ collisionMessage: string
+): Promise<string> {
+ // A generated context name is an implementation detail. Hide the rare
+ // collision from the operator by trying one fresh suffix before surfacing the
+ // existing friendly error. The successful name is returned to become the
+ // Host's contextRef.
+ for (let attempt = 0; attempt < 2; attempt += 1) {
+ const contextName = createAgentContextName(agentName)
+ try {
+ await createOrThrow(
+ '/api/v1/admin/contexts',
+ {
+ metadata: { name: contextName },
+ spec: {
+ contextId: contextName,
+ description: `Connector context for agent ${agentName}`,
+ mcpServers: selectedMcpServers,
+ },
+ },
+ collisionMessage
+ )
+ return contextName
+ } catch (error) {
+ if (!(error instanceof ResourceNameCollisionError) || attempt === 1) throw error
+ }
}
-): boolean {
+
+ throw new Error(collisionMessage)
+}
+
+function isStepValid(stepIndex: number, state: HostWizardValidationState): boolean {
if (stepIndex === 0)
return state.hostName.trim().length > 0 && getAgentNameError(state.hostName) === ''
if (stepIndex === 1) {
- if (state.contextMode === 'existing') return state.selectedExistingContext.trim().length > 0
- return state.contextName.trim().length > 0
- }
- if (stepIndex === 2) {
- // Broker-only chains (Codex with no static fallback) need an explicit
- // catalog model and no Secret. Any static primary/fallback still requires
- // the exact credential slots (existing Secret or a complete new one).
if (!state.modelName.trim()) return false
if (
state.provider === 'codex-subscription' &&
- (!state.connectionRef?.trim() ||
+ (!state.connectionRef.trim() ||
state.connectionRef.trim() === CODEX_UNASSIGNED_CONNECTION_KEY ||
- !state.codexModels?.includes(state.modelName.trim()))
+ (state.codexModels.length > 0 && !state.codexModels.includes(state.modelName.trim())))
) {
return false
}
- if (!llmChainRequiresSecret(state.provider, state.llmPolicy?.fallbacks)) return true
+ // Broker-only chains (Codex with no static fallback) need the grant in the
+ // shared LLM Secret picker. Any static primary/fallback still requires the
+ // exact credential slots (existing Secret or a complete new one).
+ if (!llmChainRequiresSecret(state.provider, state.llmPolicy?.fallbacks)) {
+ return (
+ state.provider === 'codex-subscription' &&
+ parseCredentialSelect(state.existingSecret).kind === 'subscription'
+ )
+ }
// New secret: the PRIMARY provider must be usable (asymmetric gate — a
// fallback missing its key only warns). Cross-slot mistakes (half Bedrock
// pair, malformed Vertex JSON) anywhere still block. Existing secret: the
@@ -299,15 +213,17 @@ function isStepValid(
state.llmKeyDraft,
getActiveCredentialKeys(state.provider, state.llmPolicy)
)
- return state.secretMode === 'existing'
- ? state.provider === 'codex-subscription'
- ? state.existingLlmSecret.trim().length > 0
- : parseCredentialSelect(state.existingSecret).kind === 'secret'
- : toKebabCase(state.newSecretName).length > 0 &&
+ const hasValidSecret =
+ state.secretMode === 'existing'
+ ? state.provider === 'codex-subscription'
+ ? state.existingLlmSecret.trim().length > 0
+ : parseCredentialSelect(state.existingSecret).kind === 'secret'
+ : toKebabCase(state.newSecretName).length > 0 &&
primaryCredentialUsable(state.provider, state.llmKeyDraft) &&
validateLlmSecretData(projectedDraft).length === 0
+ return hasValidSecret
}
- if (stepIndex === 3) return true
+ if (stepIndex === 2 || stepIndex === 3) return true
return false
}
@@ -338,15 +254,11 @@ export function HostWizard({
const hostNamespace = HOST_NAMESPACE
const agentNameError = getAgentNameError(hostName)
- const [contextName, setContextName] = useState('')
- const [contextMode, setContextMode] = useState<'existing' | 'new'>('existing')
- const [selectedExistingContext, setSelectedExistingContext] = useState('')
const [selectedMcp, setSelectedMcp] = useState<string[]>([])
- const [existingContexts, setExistingContexts] = useState<ContextOption[]>([])
// Reuse an existing shared Secret by default. Creating an agent-specific Secret
// remains available when the operator explicitly chooses New credential.
- const [secretMode, setSecretMode] = useState<HostLlmSecretMode>('existing')
+ const [secretMode, setSecretMode] = useState<'existing' | 'new'>('existing')
const [existingSecret, setExistingSecret] = useState('')
const [existingLlmSecret, setExistingLlmSecret] = useState('')
const [newSecretName, setNewSecretName] = useState('')
@@ -419,10 +331,11 @@ export function HostWizard({
...codexConnections
.filter(row => row.status !== 'revoked')
.map(row => ({
- group: 'Subscriptions',
+ group: 'ChatGPT subscriptions',
value: credentialSelectValue('', row.connectionKey),
label: row.displayName || row.connectionKey,
meta: 'ChatGPT subscription',
+ providers: [{ id: 'codex-subscription', label: 'ChatGPT' }],
})),
],
[codexConnections, existingSecrets]
@@ -431,12 +344,6 @@ export function HostWizard({
() => secretOptions.filter(option => option.group === 'API keys'),
[secretOptions]
)
- const selectedContextOption = useMemo(
- () =>
- existingContexts.find(ctx => `${ctx.namespace}/${ctx.name}` === selectedExistingContext) ||
- null,
- [existingContexts, selectedExistingContext]
- )
const catalogForEditor = useMemo(() => {
if (provider !== 'codex-subscription') return allowedCatalog
const others = allowedCatalog.filter(row => row.provider !== 'codex-subscription')
@@ -479,20 +386,12 @@ export function HostWizard({
if (!Array.isArray(selectedSecret?.keys)) return
const [linkedProvider] = getProvidersWithCompleteCredentials(selectedSecret.keys)
if (!linkedProvider) return
- setProvider(linkedProvider === 'codex-subscription' ? 'openai' : linkedProvider)
- setModelName(
- resolveDefaultModel(
- linkedProvider === 'codex-subscription' ? 'openai' : linkedProvider,
- getModelOptions(
- allowedCatalog,
- linkedProvider === 'codex-subscription' ? 'openai' : linkedProvider
- )
- )
- )
+ const nextProvider = linkedProvider === 'codex-subscription' ? 'openai' : linkedProvider
+ setProvider(nextProvider)
+ setModelName(resolveDefaultModel(nextProvider, getModelOptions(allowedCatalog, nextProvider)))
},
- [allowedCatalog, codexConnections, existingSecrets]
+ [allowedCatalog, existingSecrets]
)
-
useEffect(() => {
let cancelled = false
void listCodexSubscriptionConnections()
@@ -590,13 +489,9 @@ export function HostWizard({
[teams]
)
- const canNext = useMemo(() => {
- return isStepValid(step, {
+ const validationState = useMemo<HostWizardValidationState>(
+ () => ({
hostName,
- contextMode,
- contextName,
- selectedExistingContext,
- selectedMcp,
secretMode,
existingSecret,
existingLlmSecret,
@@ -607,71 +502,39 @@ export function HostWizard({
modelName,
connectionRef,
codexModels,
- selectedUserIds,
- selectedTeamIds,
- directoryLoadFailed: directoryLoadError.length > 0,
- })
- }, [
- step,
- hostName,
- contextMode,
- contextName,
- selectedExistingContext,
- selectedMcp,
- secretMode,
- existingSecret,
- existingLlmSecret,
- newSecretName,
- llmKeyDraft,
- llmPolicy,
- provider,
- modelName,
- connectionRef,
- codexModels,
- selectedUserIds,
- selectedTeamIds,
- directoryLoadError,
- ])
+ }),
+ [
+ hostName,
+ secretMode,
+ existingSecret,
+ existingLlmSecret,
+ newSecretName,
+ llmKeyDraft,
+ llmPolicy,
+ provider,
+ modelName,
+ connectionRef,
+ codexModels,
+ ]
+ )
+
+ const canNext = useMemo(() => isStepValid(step, validationState), [step, validationState])
const loadDirectory = useCallback(async () => {
setDirectoryLoading(true)
setDirectoryLoadError('')
setError('')
try {
- const [usersData, teamsData, contextsData] = await Promise.all([
- getAdminUsers(''),
- getAdminTeams(),
- apiGet('/api/v1/admin/contexts') as Promise<{
- items?: Array<{
- metadata?: { name?: string; namespace?: string }
- spec?: { contextId?: string; mcpServers?: unknown[] }
- }>
- }>,
- ])
+ const [usersData, teamsData] = await Promise.all([getAdminUsers(''), getAdminTeams()])
if (!mountedRef.current) return
setUsers(Array.isArray(usersData.items) ? usersData.items : [])
setTeams(Array.isArray(teamsData.items) ? teamsData.items : [])
- const contextOptions = (contextsData.items || [])
- .map(ctx => ({
- name: String(ctx.metadata?.name || '').trim(),
- namespace: String(ctx.metadata?.namespace || 'default').trim(),
- contextId: String(ctx.spec?.contextId || ctx.metadata?.name || '').trim(),
- mcpServers: Array.isArray(ctx.spec?.mcpServers)
- ? ctx.spec?.mcpServers
- .map(String)
- .map(v => v.trim())
- .filter(Boolean)
- : [],
- }))
- .filter(ctx => ctx.name && ctx.contextId)
- .sort((a, b) => `${a.namespace}/${a.name}`.localeCompare(`${b.namespace}/${b.name}`))
- setExistingContexts(contextOptions)
} catch (e) {
if (!mountedRef.current) return
const message =
e instanceof Error
- ? `Failed to load users/teams/contexts: ${e.message}. You may not be able to grant access from this wizard — retry or check your session.`
- : 'Failed to load users/teams/contexts. You may not be able to grant access from this wizard.'
+ ? `Failed to load users/teams: ${e.message}. You may not be able to grant access from this wizard — retry or check your session.`
+ : 'Failed to load users/teams. You may not be able to grant access from this wizard.'
setDirectoryLoadError(message)
setError(message)
} finally {
@@ -687,53 +550,13 @@ export function HostWizard({
() => (targetStep: number) => {
if (targetStep <= step) return true
for (let i = 0; i < targetStep; i += 1) {
- if (
- !isStepValid(i, {
- hostName,
- contextMode,
- contextName,
- selectedExistingContext,
- selectedMcp,
- secretMode,
- existingSecret,
- existingLlmSecret,
- newSecretName,
- llmKeyDraft,
- llmPolicy,
- provider,
- modelName,
- connectionRef,
- codexModels,
- selectedUserIds,
- selectedTeamIds,
- directoryLoadFailed: directoryLoadError.length > 0,
- })
- ) {
+ if (!isStepValid(i, validationState)) {
return false
}
}
return true
},
- [
- step,
- hostName,
- contextMode,
- contextName,
- selectedExistingContext,
- selectedMcp,
- secretMode,
- existingSecret,
- existingLlmSecret,
- newSecretName,
- llmKeyDraft,
- llmPolicy,
- provider,
- modelName,
- connectionRef,
- selectedUserIds,
- selectedTeamIds,
- directoryLoadError,
- ]
+ [step, validationState]
)
const validationMessage = useMemo(() => {
@@ -741,56 +564,36 @@ export function HostWizard({
const agentNameError = getAgentNameError(hostName)
if (agentNameError) return agentNameError
}
- if (step === 1 && contextMode === 'existing' && !selectedExistingContext.trim())
- return 'Select an existing context.'
- if (step === 1 && contextMode === 'new' && !contextName.trim())
- return 'Context name is required.'
- if (step === 2 && !modelName.trim()) return 'Model name is required.'
+ if (step === 1 && !modelName.trim()) return 'Model name is required.'
+ if (step === 1 && secretMode === 'existing' && !existingSecret.trim())
+ return 'Select an existing LLM Secret.'
if (
- step === 2 &&
+ step === 1 &&
+ secretMode === 'existing' &&
provider === 'codex-subscription' &&
- (!connectionRef.trim() || connectionRef === CODEX_UNASSIGNED_CONNECTION_KEY)
+ chainRequiresSecret &&
+ !existingLlmSecret.trim()
) {
- return 'Choose a ChatGPT subscription before continuing.'
+ return 'Select an existing LLM Secret.'
}
- if (step === 2 && llmChainRequiresSecret(provider, llmPolicy?.fallbacks)) {
- if (
- secretMode === 'existing' &&
- provider === 'codex-subscription' &&
- !existingLlmSecret.trim()
- ) {
- return 'Select an existing secret.'
- }
- if (
- secretMode === 'existing' &&
- provider !== 'codex-subscription' &&
- !existingSecret.trim()
- ) {
- return 'Select an existing secret.'
- }
- if (secretMode === 'new' && !toKebabCase(newSecretName)) {
- return 'For a new secret, set a name.'
- }
- if (secretMode === 'new' && !primaryCredentialUsable(provider, llmKeyDraft)) {
- return `Add the ${getProviderLabel(provider)} credential for the primary model.`
- }
- if (secretMode === 'new') {
- const projected = projectCredentialDraft(
- llmKeyDraft,
- getActiveCredentialKeys(provider, llmPolicy)
- )
- const slotErrors = validateLlmSecretData(projected)
- if (slotErrors.length > 0) return slotErrors[0]
- }
+ if (step === 1 && secretMode === 'new' && !toKebabCase(newSecretName)) {
+ return 'For a new LLM Secret, set a name.'
+ }
+ if (step === 1 && secretMode === 'new' && !primaryCredentialUsable(provider, llmKeyDraft)) {
+ return `Add the ${getProviderLabel(provider)} credential for the primary model.`
+ }
+ if (step === 1 && secretMode === 'new') {
+ const projected = projectCredentialDraft(
+ llmKeyDraft,
+ getActiveCredentialKeys(provider, llmPolicy)
+ )
+ const slotErrors = validateLlmSecretData(projected)
+ if (slotErrors.length > 0) return slotErrors[0]
}
return ''
}, [
step,
hostName,
- contextMode,
- contextName,
- selectedExistingContext,
- selectedMcp,
secretMode,
existingSecret,
existingLlmSecret,
@@ -799,9 +602,7 @@ export function HostWizard({
llmPolicy,
provider,
modelName,
- connectionRef,
- selectedUserIds,
- selectedTeamIds,
+ chainRequiresSecret,
])
function resetForm() {
@@ -809,15 +610,10 @@ export function HostWizard({
setError('')
setHostName('')
- setContextName('')
- setContextMode('existing')
- setSelectedExistingContext('')
setSelectedMcp([])
setSecretMode('existing')
setExistingSecret('')
setExistingLlmSecret('')
- setConnectionRef(CODEX_UNASSIGNED_CONNECTION_KEY)
- setCodexModels([])
setNewSecretName('')
setSecretNameTouched(false)
setLlmKeyDraft(createEmptyLlmKeyDraft())
@@ -825,6 +621,8 @@ export function HostWizard({
setAllowedModels([])
setProvider('openai')
setModelName(resolveDefaultModel('openai', getModelOptions(allowedCatalog, 'openai')))
+ setConnectionRef(CODEX_UNASSIGNED_CONNECTION_KEY)
+ setCodexModels([])
setStateless(false)
setSelectedUserIds([])
setSelectedTeamIds([])
@@ -844,10 +642,6 @@ export function HostWizard({
})
}
- function selectExistingContext(context: ContextOption) {
- setSelectedExistingContext(`${context.namespace}/${context.name}`)
- }
-
async function submitAll() {
setBusy(true)
setError('')
@@ -860,9 +654,6 @@ export function HostWizard({
let hostCreated = false
try {
const normalizedHostName = toKebabCase(hostName)
- const normalizedContextName = toKebabCase(contextName)
- const resolvedContextName =
- contextMode === 'existing' ? selectedContextOption?.contextId || '' : normalizedContextName
const normalizedSecretName = toKebabCase(newSecretName)
if (chainRequiresSecret && secretMode === 'new') {
@@ -899,23 +690,15 @@ export function HostWizard({
created.push({ kind: 'secret', name: normalizedSecretName })
}
- if (contextMode === 'new') {
- // Create-only POST (R5-C1/R5-B1): a name collision must 409 AlreadyExists
- // server-side, never silently overwrite a foreign context via a PUT.
- await createOrThrow(
- '/api/v1/admin/contexts',
- {
- metadata: { name: normalizedContextName },
- spec: {
- contextId: normalizedContextName,
- description: `Context for agent ${normalizedHostName}`,
- mcpServers: Array.from(new Set(selectedMcp)),
- },
- },
- `A context named "${normalizedContextName}" already exists — choose another name.`
- )
- created.push({ kind: 'context', name: normalizedContextName })
- }
+ // Every agent gets a private implementation context. The context name is
+ // intentionally generated here instead of being exposed as a wizard
+ // field; the agent still needs a contextRef for its runtime contract.
+ const generatedContextName = await createPrivateContext(
+ normalizedHostName,
+ Array.from(new Set(selectedMcp)),
+ 'The agent connector context could not be created — please try again.'
+ )
+ created.push({ kind: 'context', name: generatedContextName })
// Effective per-host model subset (Topic 3a): prune the draft to the
// providers actually in this host's domain (primary + fallbacks), then
@@ -941,7 +724,7 @@ export function HostWizard({
const hostSpec: Record<string, unknown> = {
host: normalizedHostName,
- contextRef: resolvedContextName,
+ contextRef: generatedContextName,
...(resolvedSecretRef ? { secretRef: resolvedSecretRef } : {}),
channels: [],
model: {
@@ -1123,161 +906,10 @@ export function HostWizard({
{step === 1 && (
<div className="cu-form-stack cu-agent-form-stack">
- <div className="cu-agent-radio-group">
- <label className="cu-agent-radio cu-agent-radio--card">
- <input
- type="radio"
- checked={contextMode === 'existing'}
- onChange={() => setContextMode('existing')}
- />
- <span className="cu-agent-radio__copy">
- <span className="cu-agent-radio__title">Use existing context</span>
- <span className="cu-agent-radio__description">
- Select a saved context and reuse its MCP server attachments.
- </span>
- </span>
- </label>
- <label className="cu-agent-radio cu-agent-radio--card">
- <input
- type="radio"
- checked={contextMode === 'new'}
- onChange={() => setContextMode('new')}
- />
- <span className="cu-agent-radio__copy">
- <span className="cu-agent-radio__title">Create new context</span>
- <span className="cu-agent-radio__description">
- Create a context for this agent. MCP servers can be attached now or later.
- </span>
- </span>
- </label>
- </div>
- {contextMode === 'existing' ? (
- <>
- <div className="cu-agent-access-section">
- <strong>Select Context</strong>
- <SelectionDropdown
- multiple={false}
- value={selectedExistingContext ? [selectedExistingContext] : []}
- onChange={values => {
- const next = values[0] || ''
- const context = existingContexts.find(
- ctx => `${ctx.namespace}/${ctx.name}` === next
- )
- if (context) selectExistingContext(context)
- else setSelectedExistingContext('')
- }}
- options={existingContexts.map(ctx => ({
- value: `${ctx.namespace}/${ctx.name}`,
- label: ctx.contextId,
- }))}
- placeholder="Select context..."
- searchPlaceholder="Search contexts..."
- selectionLabel="Selected context"
- emptyLabel="No contexts available."
- />
- </div>
- {selectedContextOption && (
- <section
- className="cu-agent-context-mcp-summary"
- aria-label="Attached MCP servers"
- >
- <div className="cu-agent-context-mcp-summary__head">
- <span>MCP servers</span>
- <span>{selectedContextOption.mcpServers.length}</span>
- </div>
- {selectedContextOption.mcpServers.length > 0 ? (
- <ul className="cu-agent-context-mcp-summary__list">
- {selectedContextOption.mcpServers.map(server => (
- <li key={server} title={server}>
- {server}
- </li>
- ))}
- </ul>
- ) : (
- <p className="cu-muted">No MCP servers attached.</p>
- )}
- </section>
- )}
- </>
- ) : (
- <>
- <Field
- description="Automatically formatted to lowercase with hyphens."
- label="Context name"
- >
- <TextInput
- value={contextName}
- onChange={e => setContextName(toKebabInput(e.target.value))}
- placeholder="context-name"
- />
- </Field>
- <div className="cu-agent-section-label">MCP servers (optional)</div>
- <div className="cu-agent-mcp-grid">
- {availableMcp.map(name => (
- <CheckboxField
- key={name}
- checked={selectedMcp.includes(name)}
- className="cu-agent-mcp-option"
- label={
- <span className="cu-agent-mcp-option__label">
- <span className="cu-agent-mcp-option__name">{name}</span>
- <span className="cu-agent-mcp-option__meta">MCP server</span>
- </span>
- }
- onChange={() => toggleMcp(name)}
- />
- ))}
- {availableMcp.length === 0 ? (
- <span className="cu-agent-empty-note">No MCP servers available.</span>
- ) : null}
- </div>
- </>
- )}
- </div>
- )}
-
- {step === 2 && (
- <div className="cu-form-stack cu-agent-form-stack">
- <LlmProviderConfig
- provider={provider}
- model={modelName}
- onPrimaryChange={next => {
- setProvider(next.provider)
- setModelName(next.model)
- if (next.provider !== 'codex-subscription') {
- setConnectionRef(CODEX_UNASSIGNED_CONNECTION_KEY)
- setCodexModels([])
- if (parseCredentialSelect(existingSecret).kind === 'subscription') {
- setExistingSecret('')
- }
- }
- }}
- policy={llmPolicy}
- onPolicyChange={setLlmPolicy}
- allowedModels={allowedModels}
- onAllowedModelsChange={setAllowedModels}
- catalog={catalogForEditor}
- catalogLoading={modelsLoading}
- catalogError={modelsError}
- modelLabel="Default model"
- showAllowedModels={false}
- credentials={
- chainRequiresSecret && secretMode === 'new'
- ? {
- draft: llmKeyDraft,
- onChange: (dataKey, value) =>
- setLlmKeyDraft(prev => ({ ...prev, [dataKey]: value })),
- }
- : undefined
- }
- secretKeys={chainRequiresSecret && secretMode === 'new' ? llmSecretKeys : []}
- fallbackProvidersInitiallyCollapsed
- disabled={busy}
- />
<div className="cu-agent-access-section">
- <strong>Credentials</strong>
+ <strong>LLM credentials</strong>
<span className="cu-muted cu-agent-access-hint">
- Choose an API key secret or a ChatGPT subscription, or create a new secret.
+ Link an existing LLM Secret or create one for this agent.
</span>
<div className="cu-agent-radio-group">
<label className="cu-agent-radio cu-agent-radio--card">
@@ -1287,9 +919,9 @@ export function HostWizard({
onChange={() => setSecretMode('existing')}
/>
<span className="cu-agent-radio__copy">
- <span className="cu-agent-radio__title">Use an existing secret</span>
+ <span className="cu-agent-radio__title">Use an existing LLM Secret</span>
<span className="cu-agent-radio__description">
- Select a saved API key secret or a ChatGPT grant.
+ Link a saved LLM Secret that already contains provider credentials.
</span>
</span>
</label>
@@ -1303,6 +935,7 @@ export function HostWizard({
setConnectionRef(CODEX_UNASSIGNED_CONNECTION_KEY)
setCodexModels([])
setExistingSecret('')
+ setExistingLlmSecret('')
setProvider('openai')
setModelName(
resolveDefaultModel('openai', getModelOptions(allowedCatalog, 'openai'))
@@ -1311,26 +944,27 @@ export function HostWizard({
}}
/>
<span className="cu-agent-radio__copy">
- <span className="cu-agent-radio__title">New secret</span>
+ <span className="cu-agent-radio__title">Create a new LLM Secret</span>
<span className="cu-agent-radio__description">
- Create a new secret for this agent. Its name is derived from the agent name.
+ Create a private LLM Secret for this agent. Its internal name is derived from
+ the agent name.
</span>
</span>
</label>
</div>
{secretMode === 'existing' ? (
<div className="cu-agent-access-section">
- <strong>Credential</strong>
- <WizardSelect
+ <strong>LLM Secret</strong>
+ <LlmSecretSelect
value={existingSecret}
- placeholder="Select credential"
+ placeholder="Select LLM Secret..."
options={secretOptions}
onChange={handleExistingSecretChange}
/>
{provider === 'codex-subscription' && chainRequiresSecret ? (
<>
<strong>LLM secret</strong>
- <WizardSelect
+ <LlmSecretSelect
value={existingLlmSecret}
placeholder="Select secret..."
options={apiKeyOptions}
@@ -1341,8 +975,8 @@ export function HostWizard({
</div>
) : (
<Field
- description="Auto-named from the agent — edit if you prefer a different name."
- label="Secret name"
+ description="Auto-named from the agent — edit the internal name if you prefer a different one."
+ label="LLM Secret name"
>
<span className="cu-agent-input-shell">
<TextInput
@@ -1351,7 +985,7 @@ export function HostWizard({
setSecretNameTouched(true)
setNewSecretName(toKebabInput(e.target.value))
}}
- placeholder="secret-name"
+ placeholder="llm-secret-name"
/>
<span
className={cn(
@@ -1359,7 +993,9 @@ export function HostWizard({
!toKebabCase(newSecretName) && 'cu-agent-input-shell__status--empty'
)}
aria-label={
- toKebabCase(newSecretName) ? 'Valid secret name' : 'Secret name empty'
+ toKebabCase(newSecretName)
+ ? 'Valid LLM Secret name'
+ : 'LLM Secret name empty'
}
>
{toKebabCase(newSecretName) ? <IconCheck width={16} height={16} /> : null}
@@ -1368,10 +1004,46 @@ export function HostWizard({
</Field>
)}
</div>
+ <LlmProviderConfig
+ provider={provider}
+ model={modelName}
+ onPrimaryChange={next => {
+ setProvider(next.provider)
+ setModelName(next.model)
+ if (next.provider !== 'codex-subscription') {
+ setConnectionRef(CODEX_UNASSIGNED_CONNECTION_KEY)
+ setCodexModels([])
+ if (parseCredentialSelect(existingSecret).kind === 'subscription') {
+ setExistingSecret('')
+ }
+ }
+ }}
+ policy={llmPolicy}
+ onPolicyChange={setLlmPolicy}
+ allowedModels={allowedModels}
+ onAllowedModelsChange={setAllowedModels}
+ catalog={catalogForEditor}
+ catalogLoading={modelsLoading}
+ catalogError={modelsError}
+ modelLabel="Default model"
+ showAllowedModels={false}
+ credentials={
+ chainRequiresSecret && secretMode === 'new'
+ ? {
+ draft: llmKeyDraft,
+ onChange: (dataKey, value) =>
+ setLlmKeyDraft(prev => ({ ...prev, [dataKey]: value })),
+ }
+ : undefined
+ }
+ secretKeys={chainRequiresSecret && secretMode === 'new' ? llmSecretKeys : []}
+ fallbackProvidersInitiallyCollapsed
+ disabled={busy}
+ />
</div>
)}
- {step === 3 && (
+ {step === 2 && (
<div className="cu-form-stack cu-agent-form-stack cu-agent-form-stack--wide">
{directoryLoadError ? (
<div className="cu-workflow-access__error" role="alert">
@@ -1469,6 +1141,39 @@ export function HostWizard({
</div>
)}
+ {step === 3 && (
+ <div className="cu-form-stack cu-agent-form-stack">
+ <div className="cu-agent-access-section">
+ <strong>Connectors</strong>
+ <span className="cu-muted cu-agent-access-hint">
+ Choose the connectors this agent can use. You can leave this empty and add
+ connectors later.
+ </span>
+ </div>
+ <div className="cu-agent-section-label">Available connectors (optional)</div>
+ <div className="cu-agent-mcp-grid" role="group" aria-label="Available connectors">
+ {availableMcp.map(name => (
+ <CheckboxField
+ key={name}
+ checked={selectedMcp.includes(name)}
+ className="cu-agent-mcp-option"
+ label={
+ <span className="cu-agent-mcp-option__label">
+ <span className="cu-agent-mcp-option__name">{name}</span>
+ <span className="cu-agent-mcp-option__meta">Connector</span>
+ </span>
+ }
+ disabled={busy}
+ onChange={() => toggleMcp(name)}
+ />
+ ))}
+ {availableMcp.length === 0 ? (
+ <span className="cu-agent-empty-note">No connectors available.</span>
+ ) : null}
+ </div>
+ </div>
+ )}
+
{error ? (
<div className="cu-banner cu-banner--error cu-agent-flow-message">{error}</div>
) : null}
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 4f7c2c87d..459efda58 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.465",
+ "version": "0.1.466",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.465",
+ "version": "0.1.466",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/llm-providers": "file:../packages/llm-providers",
diff --git a/control-ui/package.json b/control-ui/package.json
index ea1b74a25..d3e70a514 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.465",
+ "version": "0.1.466",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",