@electric-ax/agents-server 0.4.6 → 0.4.7

package/src/routing/entities-router.ts

@@ -18,6 +18,7 @@ import {
   backfillEntityDispatchPolicy,
   linkEntityDispatchSubscription,
   resolveEffectiveDispatchPolicyForSpawn,
+  shouldLinkDispatchBeforeInitialMessage,
   unlinkEntityDispatchSubscription,
 } from './dispatch-policy.js'
 import { routeBody, withSchema } from './schema.js'
@@ -133,6 +134,22 @@ const setTagBodySchema = Type.Object({
   value: Type.String(),
 })
 
+const entitySignalSchema = Type.Union([
+  Type.Literal(`SIGINT`),
+  Type.Literal(`SIGHUP`),
+  Type.Literal(`SIGTERM`),
+  Type.Literal(`SIGKILL`),
+  Type.Literal(`SIGSTOP`),
+  Type.Literal(`SIGCONT`),
+  Type.Literal(`SIGUSR`),
+])
+
+const signalBodySchema = Type.Object({
+  signal: entitySignalSchema,
+  reason: Type.Optional(Type.String()),
+  payload: Type.Optional(Type.Unknown()),
+})
+
 const scheduleBodySchema = Type.Union([
   Type.Object({
     scheduleType: Type.Literal(`cron`),
@@ -161,6 +178,7 @@ type SendBody = Static<typeof sendBodySchema>
 type InboxMessageBody = Static<typeof inboxMessageBodySchema>
 type ForkBody = Static<typeof forkBodySchema>
 type SetTagBody = Static<typeof setTagBodySchema>
+type SignalBody = Static<typeof signalBodySchema>
 type ScheduleBody = Static<typeof scheduleBodySchema>
 type EntitiesRegisterBody = Static<typeof entitiesRegisterBodySchema>
 
@@ -187,6 +205,12 @@ entitiesRouter.put(
 entitiesRouter.get(`/:type/:instanceId`, withExistingEntity, getEntity)
 entitiesRouter.head(`/:type/:instanceId`, withExistingEntity, headEntity)
 entitiesRouter.delete(`/:type/:instanceId`, withExistingEntity, killEntity)
+entitiesRouter.post(
+  `/:type/:instanceId/signal`,
+  withExistingEntity,
+  withSchema(signalBodySchema),
+  signalEntity
+)
 entitiesRouter.post(
   `/:type/:instanceId/send`,
   withExistingEntity,
@@ -614,13 +638,21 @@ async function spawnEntity(
     wake: parsed.wake,
     created_by: principal.url,
   })
-  await linkEntityDispatchSubscription(ctx, entity)
+  const linkBeforeInitialMessage =
+    parsed.initialMessage !== undefined &&
+    shouldLinkDispatchBeforeInitialMessage(dispatchPolicy)
+  if (linkBeforeInitialMessage) {
+    await linkEntityDispatchSubscription(ctx, entity)
+  }
   if (parsed.initialMessage !== undefined) {
     await ctx.entityManager.send(entity.url, {
       from: principal.url,
       payload: parsed.initialMessage,
     })
   }
+  if (!linkBeforeInitialMessage) {
+    await linkEntityDispatchSubscription(ctx, entity)
+  }
 
   return json(
     { ...toPublicEntity(entity), txid: entity.txid },
@@ -655,3 +687,27 @@ async function killEntity(
   ctx.runtime.claimWriteTokens.clearStream(ctx.service, entity.streams.main)
   return json(result)
 }
+
+async function signalEntity(
+  request: AgentsRouteRequest,
+  ctx: TenantContext
+): Promise<Response> {
+  const principalMutationError = rejectPrincipalEntityMutation(
+    request,
+    `signaled`
+  )
+  if (principalMutationError) return principalMutationError
+
+  const parsed = routeBody<SignalBody>(request)
+  const { entityUrl, entity } = requireExistingEntityRoute(request)
+  const result = await ctx.entityManager.signal(entityUrl, {
+    signal: parsed.signal,
+    reason: parsed.reason,
+    payload: parsed.payload,
+  })
+  if (result.new_state === `stopped` || result.new_state === `killed`) {
+    await unlinkEntityDispatchSubscription(ctx, entity)
+    ctx.runtime.claimWriteTokens.clearStream(ctx.service, entity.streams.main)
+  }
+  return json(result)
+}

package/src/routing/internal-router.ts

@@ -479,7 +479,7 @@ async function webhookForward(
         enrichPromise,
       ])
 
-      if (entity?.status === `stopped`) {
+      if (entity?.status === `stopped` || entity?.status === `paused`) {
         if (upsertPromise) await upsertPromise
         return json({ done: true })
       }
@@ -764,10 +764,13 @@ async function callbackForward(
       //   the token is intact even though entityDispatchState may diverge.
       // If both are false, a newer wake owns the entity — leave status as-is.
       if (entity && (entityCleared || stillOwnsClaim)) {
-        await ctx.entityManager.registry.updateStatus(entity.url, `idle`)
+        await ctx.entityManager.registry.updateStatus(
+          entity.url,
+          entity.status === `stopping` ? `stopped` : `idle`
+        )
         await ctx.entityBridgeManager.onEntityChanged(entity.url)
         serverLog.info(
-          `[callback-forward] status updated to idle for ${entity.url}`
+          `[callback-forward] status updated after done for ${entity.url}`
         )
       } else if (!entity) {
         serverLog.warn(

package/src/routing/runners-router.ts

@@ -575,7 +575,7 @@ async function notificationFromClaim(
       404
     )
   }
-  if (entity.status === `stopped`) {
+  if (entity.status === `stopped` || entity.status === `paused`) {
     await ctx.streamClient.releaseSubscription(
       input.subscriptionId,
       input.claim.token,

package/src/runtime.ts

@@ -533,7 +533,11 @@ export class ElectricAgentsTenantRuntime {
       return
     }
 
-    await this.manager.registry.updateStatus(entityUrl, `idle`)
+    const entity = await this.manager.registry.getEntity(entityUrl)
+    await this.manager.registry.updateStatus(
+      entityUrl,
+      entity?.status === `stopping` ? `stopped` : `idle`
+    )
     await this.entityBridgeManager.onEntityChanged(entityUrl)
   }
 }