@electric-ax/agents-server 0.4.15 → 0.4.17

package/src/routing/entities-router.ts

@@ -16,6 +16,7 @@ import {
   ErrCodeNotFound,
   ErrCodeUnknownEntityType,
   ErrCodeInvalidRequest,
+  ErrCodeUnauthorized,
   toPublicEntity,
 } from '../electric-agents-types.js'
 import {
@@ -27,8 +28,19 @@ import {
   unlinkEntityDispatchSubscription,
 } from './dispatch-policy.js'
 import { ElectricAgentsError } from '../entity-manager.js'
+import {
+  canAccessEntity,
+  canAccessEntityType,
+  isPermissionBypassPrincipal,
+  principalSubject,
+} from '../permissions.js'
 import { routeBody, withSchema } from './schema.js'
-import type { ElectricAgentsEntity } from '../electric-agents-types.js'
+import type {
+  ElectricAgentsEntity,
+  ElectricAgentsEntityType,
+  EntityPermission,
+  SendRequest,
+} from '../electric-agents-types.js'
 import type { JsonRouteRequest } from './schema.js'
 import type { RouterType } from 'itty-router'
 import type { TenantContext } from './context.js'
@@ -36,9 +48,11 @@ import type { EventSourceSubscriptionInput } from '@electric-ax/agents-runtime'
 
 interface AgentsRouteRequest extends JsonRouteRequest {
   entityRoute?: ExistingEntityRoute
+  spawnRoute?: SpawnableEntityRoute
 }
 
 type ExistingEntityRoute = { entityUrl: string; entity: ElectricAgentsEntity }
+type SpawnableEntityRoute = { entityType: ElectricAgentsEntityType }
 type AgentsRouteArgs = [TenantContext]
 type AgentsRouteResult = Response | undefined
 
@@ -78,6 +92,41 @@ const wakeConditionSchema = Type.Union([
   }),
 ])
 
+const permissionSubjectSchema = Type.Object(
+  {
+    subject_kind: Type.Union([
+      Type.Literal(`principal`),
+      Type.Literal(`principal_kind`),
+    ]),
+    subject_value: Type.String(),
+  },
+  { additionalProperties: false }
+)
+
+const entityPermissionSchema = Type.Union([
+  Type.Literal(`read`),
+  Type.Literal(`write`),
+  Type.Literal(`delete`),
+  Type.Literal(`signal`),
+  Type.Literal(`fork`),
+  Type.Literal(`schedule`),
+  Type.Literal(`spawn`),
+  Type.Literal(`manage`),
+])
+
+const entityPermissionGrantInputSchema = Type.Object(
+  {
+    ...permissionSubjectSchema.properties,
+    permission: entityPermissionSchema,
+    propagation: Type.Optional(
+      Type.Union([Type.Literal(`self`), Type.Literal(`descendants`)])
+    ),
+    copy_to_children: Type.Optional(Type.Boolean()),
+    expires_at: Type.Optional(Type.String()),
+  },
+  { additionalProperties: false }
+)
+
 const spawnBodySchema = Type.Object({
   args: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
   tags: Type.Optional(stringRecordSchema),
@@ -85,6 +134,8 @@ const spawnBodySchema = Type.Object({
   dispatch_policy: Type.Optional(dispatchPolicySchema),
   sandbox: Type.Optional(sandboxChoiceSchema),
   initialMessage: Type.Optional(Type.Unknown()),
+  grants: Type.Optional(Type.Array(entityPermissionGrantInputSchema)),
+  initialMessageType: Type.Optional(Type.String()),
   wake: Type.Optional(
     Type.Object({
       subscriberUrl: Type.String(),
@@ -112,8 +163,30 @@ const sendBodySchema = Type.Object({
   position: Type.Optional(Type.String()),
   afterMs: Type.Optional(Type.Number()),
   from: Type.Optional(Type.String()),
+  from_principal: Type.Optional(Type.String()),
+  from_agent: Type.Optional(Type.String()),
 })
 
+function agentUrlForPrincipal(principal: {
+  kind: string
+  id: string
+  key: string
+}): string | null {
+  if (principal.kind === `agent`) return `/${principal.id}`
+  if (principal.key.startsWith(`entity:`)) {
+    return `/${principal.key.slice(`entity:`.length)}`
+  }
+  return null
+}
+
+function agentUrlPath(value: string): string {
+  try {
+    return new URL(value).pathname
+  } catch {
+    return value
+  }
+}
+
 const inboxMessageBodySchema = Type.Object({
   payload: Type.Optional(Type.Unknown()),
   position: Type.Optional(Type.String()),
@@ -215,6 +288,9 @@ type ScheduleBody = Static<typeof scheduleBodySchema>
 type EventSourceSubscriptionBody = Static<
   typeof eventSourceSubscriptionBodySchema
 >
+type EntityPermissionGrantInput = Static<
+  typeof entityPermissionGrantInputSchema
+>
 type AttachmentSubjectType = `inbox` | `run` | `text` | `tool_call` | `context`
 type AttachmentRole = `input` | `output`
 type ParsedAttachmentForm = {
@@ -248,88 +324,137 @@ entitiesRouter.put(
   `/:type/:instanceId`,
   withSpawnableEntityType,
   withSchema(spawnBodySchema),
+  withSpawnPermission,
   spawnEntity
 )
-entitiesRouter.get(`/:type/:instanceId`, withExistingEntity, getEntity)
-entitiesRouter.head(`/:type/:instanceId`, withExistingEntity, headEntity)
-entitiesRouter.delete(`/:type/:instanceId`, withExistingEntity, killEntity)
+entitiesRouter.get(
+  `/:type/:instanceId`,
+  withExistingEntity,
+  withEntityPermission(`read`),
+  getEntity
+)
+entitiesRouter.head(
+  `/:type/:instanceId`,
+  withExistingEntity,
+  withEntityPermission(`read`),
+  headEntity
+)
+entitiesRouter.delete(
+  `/:type/:instanceId`,
+  withExistingEntity,
+  withEntityPermission(`delete`),
+  killEntity
+)
 entitiesRouter.post(
   `/:type/:instanceId/signal`,
   withExistingEntity,
   withSchema(signalBodySchema),
+  withEntityPermission(`signal`),
   signalEntity
 )
 entitiesRouter.post(
   `/:type/:instanceId/send`,
   withExistingEntity,
   withSchema(sendBodySchema),
+  withEntityPermission(`write`),
   sendEntity
 )
 entitiesRouter.post(
   `/:type/:instanceId/attachments`,
   withExistingEntity,
+  withEntityPermission(`write`),
   createAttachment
 )
 entitiesRouter.get(
   `/:type/:instanceId/attachments/:attachmentId`,
   withExistingEntity,
+  withEntityPermission(`read`),
   readAttachment
 )
 entitiesRouter.delete(
   `/:type/:instanceId/attachments/:attachmentId`,
   withExistingEntity,
+  withEntityPermission(`write`),
   deleteAttachment
 )
 entitiesRouter.patch(
   `/:type/:instanceId/inbox/:messageKey`,
   withExistingEntity,
   withSchema(inboxMessageBodySchema),
+  withEntityPermission(`write`),
   updateInboxMessage
 )
 entitiesRouter.delete(
   `/:type/:instanceId/inbox/:messageKey`,
   withExistingEntity,
+  withEntityPermission(`write`),
   deleteInboxMessage
 )
 entitiesRouter.post(
   `/:type/:instanceId/fork`,
   withExistingEntity,
   withSchema(forkBodySchema),
+  withEntityPermission(`fork`),
   forkEntity
 )
 entitiesRouter.post(
   `/:type/:instanceId/tags/:tagKey`,
   withExistingEntity,
   withSchema(setTagBodySchema),
+  withEntityPermission(`write`),
   setTag
 )
 entitiesRouter.delete(
   `/:type/:instanceId/tags/:tagKey`,
   withExistingEntity,
+  withEntityPermission(`write`),
   deleteTag
 )
 entitiesRouter.put(
   `/:type/:instanceId/schedules/:scheduleId`,
   withExistingEntity,
   withSchema(scheduleBodySchema),
+  withEntityPermission(`schedule`),
   upsertSchedule
 )
 entitiesRouter.delete(
   `/:type/:instanceId/schedules/:scheduleId`,
   withExistingEntity,
+  withEntityPermission(`schedule`),
   deleteSchedule
 )
 entitiesRouter.put(
   `/:type/:instanceId/event-source-subscriptions/:subscriptionId`,
   withExistingEntity,
   withSchema(eventSourceSubscriptionBodySchema),
+  withEntityPermission(`write`),
   upsertEventSourceSubscription
 )
 entitiesRouter.delete(
   `/:type/:instanceId/event-source-subscriptions/:subscriptionId`,
   withExistingEntity,
+  withEntityPermission(`write`),
   deleteEventSourceSubscription
 )
+entitiesRouter.get(
+  `/:type/:instanceId/grants`,
+  withExistingEntity,
+  withEntityPermission(`manage`),
+  listEntityPermissionGrants
+)
+entitiesRouter.post(
+  `/:type/:instanceId/grants`,
+  withExistingEntity,
+  withSchema(entityPermissionGrantInputSchema),
+  withEntityPermission(`manage`),
+  createEntityPermissionGrant
+)
+entitiesRouter.delete(
+  `/:type/:instanceId/grants/:grantId`,
+  withExistingEntity,
+  withEntityPermission(`manage`),
+  deleteEntityPermissionGrant
+)
 
 function entityUrlFromSegments(
   type: string,
@@ -503,6 +628,31 @@ function rejectPrincipalEntityMutation(
   )
 }
 
+function parseExpiresAt(value: string | undefined): Date | undefined {
+  if (value === undefined) return undefined
+  const expiresAt = new Date(value)
+  if (Number.isNaN(expiresAt.getTime())) {
+    throw new ElectricAgentsError(
+      ErrCodeInvalidRequest,
+      `Invalid expires_at timestamp`,
+      400
+    )
+  }
+  return expiresAt
+}
+
+function parseGrantId(request: AgentsRouteRequest): number {
+  const grantId = Number.parseInt(String(request.params.grantId), 10)
+  if (!Number.isSafeInteger(grantId) || grantId <= 0) {
+    throw new ElectricAgentsError(
+      ErrCodeInvalidRequest,
+      `Invalid grant id`,
+      400
+    )
+  }
+  return grantId
+}
+
 async function withExistingEntity(
   request: AgentsRouteRequest,
   ctx: TenantContext
@@ -574,9 +724,96 @@ async function withSpawnableEntityType(
     )
   }
 
+  request.spawnRoute = { entityType }
   return undefined
 }
 
+function withEntityPermission(permission: EntityPermission) {
+  return async (
+    request: AgentsRouteRequest,
+    ctx: TenantContext
+  ): Promise<AgentsRouteResult> => {
+    const { entity } = requireExistingEntityRoute(request)
+    if (await canAccessEntity(ctx, entity, permission, request as Request)) {
+      return undefined
+    }
+    return apiError(
+      401,
+      ErrCodeUnauthorized,
+      `Principal is not allowed to ${permission} ${entity.url}`
+    )
+  }
+}
+
+async function withSpawnPermission(
+  request: AgentsRouteRequest,
+  ctx: TenantContext
+): Promise<AgentsRouteResult> {
+  const parsed = routeBody<SpawnBody>(request)
+  const entityType = request.spawnRoute?.entityType
+  if (!entityType) {
+    throw new Error(`spawnable entity type middleware did not run`)
+  }
+
+  if (
+    !(await canAccessEntityType(ctx, entityType, `spawn`, request as Request))
+  ) {
+    return apiError(
+      401,
+      ErrCodeUnauthorized,
+      `Principal is not allowed to spawn ${entityType.name}`
+    )
+  }
+
+  if (!parsed.parent) return undefined
+
+  const parent = await ctx.entityManager.registry.getEntity(parsed.parent)
+  if (!parent) {
+    return apiError(404, ErrCodeNotFound, `Parent entity not found`)
+  }
+  if (await canAccessEntity(ctx, parent, `spawn`, request as Request)) {
+    return await validateParentedSpawnGrants(request, ctx, parent, parsed)
+  }
+  return apiError(
+    401,
+    ErrCodeUnauthorized,
+    `Principal is not allowed to spawn children from ${parent.url}`
+  )
+}
+
+async function validateParentedSpawnGrants(
+  request: AgentsRouteRequest,
+  ctx: TenantContext,
+  parent: ElectricAgentsEntity,
+  parsed: SpawnBody
+): Promise<AgentsRouteResult> {
+  const needsParentManage = (parsed.grants ?? []).some(
+    requiresParentManageForInitialGrant
+  )
+  if (!needsParentManage) return undefined
+
+  if (await canAccessEntity(ctx, parent, `manage`, request as Request)) {
+    return undefined
+  }
+
+  return apiError(
+    401,
+    ErrCodeUnauthorized,
+    `Principal is not allowed to delegate broad grants from ${parent.url}`
+  )
+}
+
+function requiresParentManageForInitialGrant(
+  grant: EntityPermissionGrantInput
+): boolean {
+  return (
+    grant.permission === `manage` ||
+    grant.subject_kind === `principal_kind` ||
+    grant.propagation === `descendants` ||
+    grant.copy_to_children === true
+  )
+}
+
 async function listEntities(
   { query }: AgentsRouteRequest,
   ctx: TenantContext
@@ -586,10 +823,61 @@ async function listEntities(
     status: firstQueryValue(query.status),
     parent: firstQueryValue(query.parent),
     created_by: firstQueryValue(query.created_by),
+    readableBy: {
+      ...principalSubject(ctx.principal),
+      bypass: isPermissionBypassPrincipal(ctx),
+    },
   })
   return json(entities.map((entity) => toPublicEntity(entity)))
 }
 
+async function listEntityPermissionGrants(
+  request: AgentsRouteRequest,
+  ctx: TenantContext
+): Promise<Response> {
+  const { entityUrl } = requireExistingEntityRoute(request)
+  const grants =
+    await ctx.entityManager.registry.listEntityPermissionGrants(entityUrl)
+  return json({ grants })
+}
+
+async function createEntityPermissionGrant(
+  request: AgentsRouteRequest,
+  ctx: TenantContext
+): Promise<Response> {
+  const { entityUrl } = requireExistingEntityRoute(request)
+  const parsed = routeBody<EntityPermissionGrantInput>(request)
+  const grant = await ctx.entityManager.registry.createEntityPermissionGrant({
+    entityUrl,
+    permission: parsed.permission,
+    subjectKind: parsed.subject_kind,
+    subjectValue: parsed.subject_value,
+    propagation: parsed.propagation,
+    copyToChildren: parsed.copy_to_children,
+    expiresAt: parseExpiresAt(parsed.expires_at),
+    createdBy: ctx.principal.url,
+  })
+  await ctx.entityBridgeManager.onEntityChanged(entityUrl)
+  return json(grant, { status: 201 })
+}
+
+async function deleteEntityPermissionGrant(
+  request: AgentsRouteRequest,
+  ctx: TenantContext
+): Promise<Response> {
+  const { entityUrl } = requireExistingEntityRoute(request)
+  const deleted = await ctx.entityManager.registry.deleteEntityPermissionGrant(
+    entityUrl,
+    parseGrantId(request)
+  )
+  if (deleted) {
+    await ctx.entityBridgeManager.onEntityChanged(entityUrl)
+  }
+  return deleted
+    ? status(204)
+    : apiError(404, ErrCodeNotFound, `Grant not found`)
+}
+
 async function upsertSchedule(
   request: AgentsRouteRequest,
   ctx: TenantContext
@@ -805,6 +1093,7 @@ async function forkEntity(
   const result = await ctx.entityManager.forkSubtree(entityUrl, {
     rootInstanceId: parsed.instance_id,
     waitTimeoutMs: parsed.waitTimeoutMs,
+    createdBy: ctx.principal.url,
     ...(parsed.fork_pointer && {
       forkPointer: {
         offset: parsed.fork_pointer.offset,
@@ -837,6 +1126,26 @@ async function sendEntity(
       `Request from must match Electric-Principal`
     )
   }
+  if (
+    parsed.from_principal !== undefined &&
+    parsed.from_principal !== principal.url
+  ) {
+    return apiError(
+      400,
+      ErrCodeInvalidRequest,
+      `Request from_principal must match Electric-Principal`
+    )
+  }
+  if (parsed.from_agent !== undefined) {
+    const principalAgentUrl = agentUrlForPrincipal(principal)
+    if (agentUrlPath(parsed.from_agent) !== principalAgentUrl) {
+      return apiError(
+        400,
+        ErrCodeInvalidRequest,
+        `Request from_agent must match authenticated agent principal`
+      )
+    }
+  }
   await ctx.entityManager.ensurePrincipal(principal)
   const { entityUrl, entity } = requireExistingEntityRoute(request)
 
@@ -845,28 +1154,25 @@ async function sendEntity(
     : await backfillEntityDispatchPolicy(ctx, entity)
   await linkEntityDispatchSubscription(ctx, dispatchEntity)
 
+  const sendReq: SendRequest = {
+    from: principal.url,
+    from_principal: principal.url,
+    from_agent: parsed.from_agent,
+    payload: parsed.payload,
+    key: parsed.key,
+    type: parsed.type,
+    mode: parsed.mode,
+    position: parsed.position,
+  }
+
   if (parsed.afterMs && parsed.afterMs > 0) {
     await ctx.entityManager.enqueueDelayedSend(
       entityUrl,
-      {
-        from: principal.url,
-        payload: parsed.payload,
-        key: parsed.key,
-        type: parsed.type,
-        mode: parsed.mode,
-        position: parsed.position,
-      },
+      sendReq,
       new Date(Date.now() + parsed.afterMs)
     )
   } else {
-    await ctx.entityManager.send(entityUrl, {
-      from: principal.url,
-      payload: parsed.payload,
-      key: parsed.key,
-      type: parsed.type,
-      mode: parsed.mode,
-      position: parsed.position,
-    })
+    await ctx.entityManager.send(entityUrl, sendReq)
   }
 
   return status(204)
@@ -988,9 +1294,29 @@ async function spawnEntity(
     dispatch_policy: dispatchPolicy,
     sandbox: parsed.sandbox,
     initialMessage: undefined,
+    initialMessageType: undefined,
     wake: parsed.wake,
     created_by: principal.url,
   })
+  if (parsed.parent) {
+    await ctx.entityManager.registry.copyEntityPermissionGrantsForSpawn(
+      parsed.parent,
+      entity.url,
+      principal.url
+    )
+  }
+  for (const grant of parsed.grants ?? []) {
+    await ctx.entityManager.registry.createEntityPermissionGrant({
+      entityUrl: entity.url,
+      permission: grant.permission,
+      subjectKind: grant.subject_kind,
+      subjectValue: grant.subject_value,
+      propagation: grant.propagation,
+      copyToChildren: grant.copy_to_children,
+      expiresAt: parseExpiresAt(grant.expires_at),
+      createdBy: principal.url,
+    })
+  }
   const linkBeforeInitialMessage =
     parsed.initialMessage !== undefined &&
     shouldLinkDispatchBeforeInitialMessage(dispatchPolicy)
@@ -1001,6 +1327,7 @@ async function spawnEntity(
     await ctx.entityManager.send(entity.url, {
       from: principal.url,
       payload: parsed.initialMessage,
+      type: parsed.initialMessageType,
     })
   }
   if (!linkBeforeInitialMessage) {