Skip to content

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

TypeScript

fix(control-ui): sequence agent access writes

Miguelon Peluchon606b0bad52c5
diff --git a/control-ui/app/profile-admin/teams/[teamId]/page.tsx b/control-ui/app/profile-admin/teams/[teamId]/page.tsx
index 685c3dd73..8d44d6de3 100644
--- a/control-ui/app/profile-admin/teams/[teamId]/page.tsx
+++ b/control-ui/app/profile-admin/teams/[teamId]/page.tsx
@@ -10,7 +10,10 @@ import { TeamRolePermissionEditor } from '@components/TeamRolePermissionEditor'
import { useToast } from '@components/Toast'
import { CONTROL_ROUTES } from '@constants/routes'
import { partitionVisibleAccess } from '@lib/accessVisibility'
-import { planAgentAccessUpdate } from '@lib/agentAccessCompatibility'
+import {
+ applyAgentAccessCompatibilityUpdate,
+ planAgentAccessUpdate,
+} from '@lib/agentAccessCompatibility'
import { getAgentDisplayName } from '@lib/agentName'
import { ConnectorCountCell } from '../../../../components/ConnectorCountCell'
import { InviteMemberDialog } from '../../../../components/InviteMemberDialog'
@@ -536,10 +539,10 @@ export default function TeamDetailsPage() {
...hostsByName.values(),
])
- const [updatedAgents, updatedContexts] = await Promise.all([
- updateAdminTeamAgents(teamId, updatePlan.agentNames, observedAgentNames),
- updateAdminTeamContexts(teamId, updatePlan.contextIds),
- ])
+ const [updatedAgents, updatedContexts] = await applyAgentAccessCompatibilityUpdate(
+ () => updateAdminTeamAgents(teamId, updatePlan.agentNames, observedAgentNames),
+ () => updateAdminTeamContexts(teamId, updatePlan.contextIds)
+ )
const hostNames = [...hostsByName.keys()]
const agentPartition = partitionVisibleAccess(
diff --git a/control-ui/app/profile-admin/users/[userId]/page.tsx b/control-ui/app/profile-admin/users/[userId]/page.tsx
index ec3db72ae..929d77d66 100644
--- a/control-ui/app/profile-admin/users/[userId]/page.tsx
+++ b/control-ui/app/profile-admin/users/[userId]/page.tsx
@@ -12,7 +12,10 @@ import { CheckboxField } from '@components/ui'
import { CONTROL_ROUTES } from '@constants/routes'
import { accessScopeLabeler } from '@lib/accessScopeLabels'
import { partitionVisibleAccess } from '@lib/accessVisibility'
-import { planAgentAccessUpdate } from '@lib/agentAccessCompatibility'
+import {
+ applyAgentAccessCompatibilityUpdate,
+ planAgentAccessUpdate,
+} from '@lib/agentAccessCompatibility'
import { getAgentDisplayName } from '@lib/agentName'
import type { DeleteCandidateTeam } from '@lib/profileAdminDelete'
import { formatTeamNames, getSoloMemberTeamsForUser } from '@lib/profileAdminDelete'
@@ -460,10 +463,10 @@ export default function UserDetailsPage() {
...hostsByName.values(),
])
- const [updatedAgents, updatedContexts] = await Promise.all([
- updateAdminUserAgents(userId, updatePlan.agentNames, observedAgentNames),
- updateAdminUserContexts(userId, updatePlan.contextIds),
- ])
+ const [updatedAgents, updatedContexts] = await applyAgentAccessCompatibilityUpdate(
+ () => updateAdminUserAgents(userId, updatePlan.agentNames, observedAgentNames),
+ () => updateAdminUserContexts(userId, updatePlan.contextIds)
+ )
const hostNames = [...hostsByName.keys()]
const agentPartition = partitionVisibleAccess(
diff --git a/control-ui/lib/__tests__/agentAccessCompatibility.test.ts b/control-ui/lib/__tests__/agentAccessCompatibility.test.ts
index 90fe66d5a..cfa5139f1 100644
--- a/control-ui/lib/__tests__/agentAccessCompatibility.test.ts
+++ b/control-ui/lib/__tests__/agentAccessCompatibility.test.ts
@@ -1,5 +1,8 @@
-import { describe, expect, it } from 'vitest'
-import { planAgentAccessUpdate } from '../agentAccessCompatibility'
+import { describe, expect, it, vi } from 'vitest'
+import {
+ applyAgentAccessCompatibilityUpdate,
+ planAgentAccessUpdate,
+} from '../agentAccessCompatibility'
import type { HostResource } from '../api'
const hosts: HostResource[] = [
@@ -47,3 +50,37 @@ describe('planAgentAccessUpdate', () => {
})
})
})
+
+describe('applyAgentAccessCompatibilityUpdate', () => {
+ it.each(['member', 'team'])(
+ 'does not start the %s Context write when the Agent CAS is stale',
+ async () => {
+ const staleCas = Object.assign(new Error('Precondition failed'), { status: 412 })
+ const updateAgents = vi.fn().mockRejectedValue(staleCas)
+ const updateContexts = vi.fn().mockResolvedValue({})
+
+ await expect(applyAgentAccessCompatibilityUpdate(updateAgents, updateContexts)).rejects.toBe(
+ staleCas
+ )
+ expect(updateAgents).toHaveBeenCalledOnce()
+ expect(updateContexts).not.toHaveBeenCalled()
+ }
+ )
+
+ it('writes Context compatibility state only after the Agent CAS succeeds', async () => {
+ const calls: string[] = []
+ const result = await applyAgentAccessCompatibilityUpdate(
+ async () => {
+ calls.push('agents')
+ return { agentNames: ['agent-alpha'] }
+ },
+ async () => {
+ calls.push('contexts')
+ return { contextIds: ['ctx-alpha'] }
+ }
+ )
+
+ expect(calls).toEqual(['agents', 'contexts'])
+ expect(result).toEqual([{ agentNames: ['agent-alpha'] }, { contextIds: ['ctx-alpha'] }])
+ })
+})
diff --git a/control-ui/lib/agentAccessCompatibility.ts b/control-ui/lib/agentAccessCompatibility.ts
index a7cb42abf..8474cc2f5 100644
--- a/control-ui/lib/agentAccessCompatibility.ts
+++ b/control-ui/lib/agentAccessCompatibility.ts
@@ -5,6 +5,19 @@ export type AgentAccessUpdatePlan = {
contextIds: string[]
}
+/**
+ * Applies the authoritative Agent CAS before its legacy Context compatibility
+ * write. A stale Agent snapshot must fail before any Context grant can change.
+ */
+export async function applyAgentAccessCompatibilityUpdate<AgentResult, ContextResult>(
+ updateAgents: () => Promise<AgentResult>,
+ updateContexts: () => Promise<ContextResult>
+): Promise<[AgentResult, ContextResult]> {
+ const updatedAgents = await updateAgents()
+ const updatedContexts = await updateContexts()
+ return [updatedAgents, updatedContexts]
+}
+
function hostName(host: HostResource): string {
return String(host.metadata?.name ?? '').trim()
}
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 7f77b8508..080158775 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.493",
+ "version": "0.1.494",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.493",
+ "version": "0.1.494",
"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 390743529..799626c52 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.493",
+ "version": "0.1.494",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",