Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.
Python agent-contextagent-memoryagent-pluginsagentic-ragcontext-databasedsh-pluginknowledge-basememorymemory-managementself-evolvingvector-database
fix(studio): stabilize account selection (#2722)
Zayn Jarvis85069d0717b0
diff --git a/web-studio/src/hooks/use-app-connection.test.ts b/web-studio/src/hooks/use-app-connection.test.tsnew file mode 100644index 000000000..5b90ff909--- /dev/null+++ b/web-studio/src/hooks/use-app-connection.test.ts@@ -0,0 +1,35 @@+import { describe, expect, it } from 'vitest'++import { resolveInitialApiKey } from './use-app-connection'++describe('resolveInitialApiKey', () => {+ it('keeps the stored connection key paired with the stored account and user', () => {+ expect(+ resolveInitialApiKey({+ defaultApiKey: 'default-key',+ envApiKey: '',+ storedApiKey: 'stored-selected-user-key',+ }),+ ).toBe('stored-selected-user-key')+ })++ it('falls back to the default key when no connection key is stored', () => {+ expect(+ resolveInitialApiKey({+ defaultApiKey: 'default-key',+ envApiKey: '',+ storedApiKey: undefined,+ }),+ ).toBe('default-key')+ })++ it('honors an explicit environment key first', () => {+ expect(+ resolveInitialApiKey({+ defaultApiKey: 'default-key',+ envApiKey: 'env-key',+ storedApiKey: 'stored-selected-user-key',+ }),+ ).toBe('env-key')+ })+})diff --git a/web-studio/src/hooks/use-app-connection.tsx b/web-studio/src/hooks/use-app-connection.tsxindex 00205eb11..0ae7b8cef 100644--- a/web-studio/src/hooks/use-app-connection.tsx+++ b/web-studio/src/hooks/use-app-connection.tsx@@ -138,6 +138,18 @@ function resolveIdentityField(return storedValue || defaultValue}+export function resolveInitialApiKey({+ defaultApiKey,+ envApiKey,+ storedApiKey,+}: {+ defaultApiKey: string+ envApiKey: string+ storedApiKey: string | undefined+}): string {+ return envApiKey || storedApiKey || defaultApiKey+}+function applyConnection(connection: ConnectionDraft,serverMode: ServerMode,@@ -180,11 +192,11 @@ function readInitialConnection(): ConnectionDraft {ENV_ADMIN_API_KEY ||storedConnection.adminApiKey ||DEFAULT_CONNECTION.adminApiKey- const apiKey =- ENV_API_KEY ||- ovClient.getConnection().apiKey ||- storedConnection.apiKey ||- DEFAULT_CONNECTION.apiKey+ const apiKey = resolveInitialApiKey({+ defaultApiKey: DEFAULT_CONNECTION.apiKey,+ envApiKey: ENV_API_KEY,+ storedApiKey: storedConnection.apiKey,+ })return normalizeConnectionDraft({...DEFAULT_CONNECTION,...storedConnection,@@ -263,8 +275,8 @@ export function AppConnectionProvider({() =>Boolean(initialConnectionRef.current?.baseUrl &&- (initialConnectionRef.current.adminApiKey ||- initialConnectionRef.current.apiKey),+ (initialConnectionRef.current.adminApiKey ||+ initialConnectionRef.current.apiKey),),)const [serverMode, setServerMode] = React.useState<ServerMode>('checking')diff --git a/web-studio/src/lib/ov-client/client.ts b/web-studio/src/lib/ov-client/client.tsindex bfe5601a0..e893a774c 100644--- a/web-studio/src/lib/ov-client/client.ts+++ b/web-studio/src/lib/ov-client/client.ts@@ -39,7 +39,7 @@ function normalizeBaseUrl(baseUrl?: string): string {}function readSessionStorage(key: string): string {- if (!isBrowser()) {+ if (!key || !isBrowser()) {return ''}@@ -51,7 +51,7 @@ function readSessionStorage(key: string): string {}function writeSessionStorage(key: string, value: string): void {- if (!isBrowser()) {+ if (!key || !isBrowser()) {return}@@ -151,7 +151,7 @@ function isEnvelopeError(value: unknown): value is OvErrorEnvelope & {export function createOvClient(options: OvClientOptions = {}): OvClientAdapter {const bindSdkClient = options.bindSdkClient ?? falselet runtimeOptions = {- apiKeyStorageKey: options.apiKeyStorageKey || DEFAULT_API_KEY_STORAGE_KEY,+ apiKeyStorageKey: options.apiKeyStorageKey ?? DEFAULT_API_KEY_STORAGE_KEY,baseUrl: normalizeBaseUrl(options.baseUrl),defaultTelemetry: options.defaultTelemetry ?? true,}@@ -316,6 +316,7 @@ export function createOvClient(options: OvClientOptions = {}): OvClientAdapter {}export const ovClient = createOvClient({+ apiKeyStorageKey: '',baseUrl: ENV_BASE_URL,bindSdkClient: true,})diff --git a/web-studio/src/routes/settings/route.tsx b/web-studio/src/routes/settings/route.tsxindex 03ef5a555..1d379ab9a 100644--- a/web-studio/src/routes/settings/route.tsx+++ b/web-studio/src/routes/settings/route.tsx@@ -295,7 +295,7 @@ function AccountFilterChips({return (<div className="flex min-w-0 flex-col gap-2"><span className="text-xs font-medium text-muted-foreground">{label}</span>- <div className="flex max-w-full flex-wrap gap-2">+ <div className="flex max-w-full min-w-0 flex-wrap gap-2">{options.map((accountId) => {const isSelected = selected.has(accountId)@@ -306,8 +306,9 @@ function AccountFilterChips({aria-pressed={isSelected}disabled={disabled}onClick={() => toggle(accountId)}+ title={accountId}className={cn(- 'h-8 rounded-full border px-3 font-mono text-xs transition-colors disabled:cursor-not-allowed disabled:opacity-50',+ 'h-8 max-w-full truncate rounded-full border px-3 font-mono text-xs transition-colors disabled:cursor-not-allowed disabled:opacity-50 sm:max-w-72',isSelected? 'border-primary bg-primary text-primary-foreground': 'border-border bg-background text-muted-foreground hover:border-primary/50 hover:text-foreground',@@ -646,22 +647,6 @@ function SettingsRoute() {serverMode !== 'dev' && (hasAdminAccess || hasSavedAdminApiKey)const canQueryAdmin = Boolean(controlApiKey) && hasAdminAccessconst showDevApiKeyPlaceholder = serverMode === 'dev'- const shouldPromoteApiKeyToAdmin =- hasAdminAccess && !draft.adminApiKey.trim() && Boolean(draft.apiKey.trim())-- React.useEffect(() => {- if (!hasAdminAccess || draft.adminApiKey.trim() || !draft.apiKey.trim()) {- return- }-- const next = {- ...draft,- adminApiKey: draft.apiKey,- apiKey: '',- }- setDraft(next)- saveConnection(next)- }, [draft, hasAdminAccess, saveConnection])const accountsQuery = useQuery({enabled: canQueryAdmin,@@ -775,8 +760,7 @@ function SettingsRoute() {Boolean(current.userId) && userIds.includes(current.userId)const userId = hasCurrentUser ? current.userId : preferredconst selectedUser = users.find((user) => user.userId === userId)- const apiKey =- selectedUser?.apiKey || (hasCurrentUser ? current.apiKey : '')+ const apiKey = selectedUser?.apiKey || ''const next = { ...current, apiKey, userId }if (next.apiKey !== current.apiKey || next.userId !== current.userId) {@@ -886,6 +870,25 @@ function SettingsRoute() {).lengthconst adminUnavailable = !canQueryAdmin || managedUsersQuery.isError+ function findSelectedUser(+ accountId: string,+ preferredUserId: string,+ ): AdminUser | undefined {+ const normalizedAccountId = accountId || DEFAULT_ACCOUNT_ID+ const candidates = [...users, ...managedUsers]+ .filter((user) => user.accountId === normalizedAccountId)+ .filter(+ (user, index, list) =>+ list.findIndex((item) => item.userId === user.userId) === index,+ )++ return (+ candidates.find((user) => user.userId === preferredUserId) ||+ candidates.find((user) => user.userId === DEFAULT_USER_ID) ||+ candidates[0]+ )+ }+function updateDraft(next: Partial<ConnectionDraft>): void {const updated = { ...draft, ...next }setDraft(updated)@@ -893,15 +896,19 @@ function SettingsRoute() {}function updateConnectionAccount(accountId: string): void {+ const selectedUser = findSelectedUser(accountId, draft.userId)+ setManagedAccountIds((current) =>+ sortedAccountIds([...current, accountId], ''),+ )updateDraft({accountId,- apiKey: '',- userId: DEFAULT_USER_ID,+ apiKey: selectedUser?.apiKey || '',+ userId: selectedUser?.userId || DEFAULT_USER_ID,})}function updateConnectionUser(userId: string): void {- const selectedUser = users.find((user) => user.userId === userId)+ const selectedUser = findSelectedUser(draft.accountId, userId)updateDraft({apiKey: selectedUser?.apiKey || '',userId,@@ -1074,11 +1081,7 @@ function SettingsRoute() {<Inputid="settings-admin-api-key"type="password"- value={- shouldPromoteApiKeyToAdmin- ? draft.apiKey- : draft.adminApiKey- }+ value={draft.adminApiKey}onChange={(event) =>updateDraft({ adminApiKey: event.target.value })}@@ -1095,7 +1098,7 @@ function SettingsRoute() {accountId={draft.accountId || DEFAULT_ACCOUNT_ID}id="settings-user-api-key"userId={draft.userId || DEFAULT_USER_ID}- value={shouldPromoteApiKeyToAdmin ? '' : draft.apiKey}+ value={draft.apiKey}onChange={(apiKey) => updateDraft({ apiKey })}placeholder={t('placeholders.userApiKey')}/>@@ -1161,48 +1164,54 @@ function SettingsRoute() {{hasAdminAccess ? (<Card className="overflow-hidden"><CardHeader className="gap-4 border-b bg-muted/20">- <div className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-start">+ <div className="flex min-w-0 flex-col gap-4"><div className="min-w-0"><CardTitle>{t('management.title')}</CardTitle>- <CardDescription>{t('management.description')}</CardDescription>+ <CardDescription className="max-w-3xl">+ {t('management.description')}+ </CardDescription></div>- <div className="flex flex-wrap items-end gap-2 lg:justify-end">- <AccountFilterChips- accounts={accountOptions}- disabled={!canQueryAdmin || accountsQuery.isLoading}- label={t('management.accountFilter')}- selectedAccountIds={selectedManagedAccountIds}- onChange={setManagedAccountIds}- />- <Button- type="button"- variant="outline"- onClick={() => void refreshAdmin()}- disabled={!canQueryAdmin || managedUsersQuery.isFetching}- >- <RefreshCwIcon- className={cn(- managedUsersQuery.isFetching && 'animate-spin',- )}+ <div className="flex min-w-0 flex-col gap-3 xl:flex-row xl:items-end xl:justify-between">+ <div className="min-w-0 flex-1">+ <AccountFilterChips+ accounts={accountOptions}+ disabled={!canQueryAdmin || accountsQuery.isLoading}+ label={t('management.accountFilter')}+ selectedAccountIds={selectedManagedAccountIds}+ onChange={setManagedAccountIds}/>- {t('actions.refresh')}- </Button>- <Button- type="button"- onClick={() => setAddAccountOpen(true)}- disabled={!canQueryAdmin}- >- <PlusIcon />- {t('actions.addAccount')}- </Button>- <Button- type="button"- onClick={() => setAddUserOpen(true)}- disabled={!canQueryAdmin}- >- <PlusIcon />- {t('actions.addUser')}- </Button>+ </div>+ <div className="flex shrink-0 flex-wrap gap-2 xl:justify-end">+ <Button+ type="button"+ variant="outline"+ onClick={() => void refreshAdmin()}+ disabled={!canQueryAdmin || managedUsersQuery.isFetching}+ >+ <RefreshCwIcon+ className={cn(+ managedUsersQuery.isFetching && 'animate-spin',+ )}+ />+ {t('actions.refresh')}+ </Button>+ <Button+ type="button"+ onClick={() => setAddAccountOpen(true)}+ disabled={!canQueryAdmin}+ >+ <PlusIcon />+ {t('actions.addAccount')}+ </Button>+ <Button+ type="button"+ onClick={() => setAddUserOpen(true)}+ disabled={!canQueryAdmin}+ >+ <PlusIcon />+ {t('actions.addUser')}+ </Button>+ </div></div></div></CardHeader>