@decocms/runtime 1.0.0-alpha.33 → 1.0.0-alpha.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/runtime",
-  "version": "1.0.0-alpha.33",
+  "version": "1.0.0-alpha.35",
   "type": "module",
   "scripts": {
     "check": "tsc --noEmit"
@@ -8,7 +8,7 @@
   "dependencies": {
     "@cloudflare/workers-types": "^4.20250617.0",
     "@deco/mcp": "npm:@jsr/deco__mcp@0.7.8",
-    "@decocms/bindings": "1.0.1-alpha.19",
+    "@decocms/bindings": "1.0.1-alpha.20",
     "@modelcontextprotocol/sdk": "1.20.2",
     "@ai-sdk/provider": "^2.0.0",
     "hono": "^4.10.7",

package/src/events.ts

@@ -10,8 +10,8 @@ import z from "zod";
 // ============================================================================
 
 export interface EventSubscription {
-  connectionId: string;
-  events: string[];
+  eventType: string;
+  publisher: string;
 }
 
 interface Binding {
@@ -214,6 +214,7 @@ const scopesFromEvents = <TSchema extends z.ZodTypeAny = never>(
 
 /**
  * Get subscriptions from event handlers and state
+ * Returns flat array of { eventType, publisher } for EVENT_SYNC_SUBSCRIPTIONS
  */
 const eventsSubscriptions = <TSchema extends z.ZodTypeAny = never>(
   handlers: EventHandlers<TSchema>,
@@ -224,10 +225,12 @@ const eventsSubscriptions = <TSchema extends z.ZodTypeAny = never>(
     const subscriptions: EventSubscription[] = [];
     for (const [, value] of Object.entries(state)) {
       if (isBinding(value)) {
-        subscriptions.push({
-          connectionId: value.value,
-          events: handlers.events,
-        });
+        for (const eventType of handlers.events) {
+          subscriptions.push({
+            eventType,
+            publisher: value.value,
+          });
+        }
       }
     }
     return subscriptions;
@@ -239,10 +242,12 @@ const eventsSubscriptions = <TSchema extends z.ZodTypeAny = never>(
     if (!isBinding(bindingValue)) continue;
 
     const eventTypes = getEventTypesForBinding(handlers, binding);
-    subscriptions.push({
-      connectionId: bindingValue.value,
-      events: eventTypes,
-    });
+    for (const eventType of eventTypes) {
+      subscriptions.push({
+        eventType,
+        publisher: bindingValue.value,
+      });
+    }
   }
   return subscriptions;
 };

package/src/tools.ts

@@ -314,24 +314,12 @@ const toolsFor = <TSchema extends z.ZodTypeAny = never>({
               });
               const bus = getEventBus(busProp, input.runtimeContext.env);
               if (events && state && bus) {
-                // subscribe to events
+                // Sync subscriptions - always call to handle deletions too
                 const subscriptions = Event.subscriptions(
                   events?.handlers ?? {},
                   state,
                 );
-
-                await Promise.all(
-                  subscriptions.map(async (subscription) => {
-                    return Promise.all(
-                      subscription.events.map(async (event) => {
-                        return bus.EVENT_SUBSCRIBE({
-                          publisher: subscription.connectionId,
-                          eventType: event,
-                        });
-                      }),
-                    );
-                  }),
-                );
+                await bus.EVENT_SYNC_SUBSCRIPTIONS({ subscriptions });
               }
               return Promise.resolve({});
             },
@@ -349,8 +337,8 @@ const toolsFor = <TSchema extends z.ZodTypeAny = never>({
             outputSchema: OnEventsOutputSchema,
             execute: async (input) => {
               const env = input.runtimeContext.env;
-              // Get state from env - it should have the binding values
-              const state = env as z.infer<TSchema>;
+              // Get state from MESH_REQUEST_CONTEXT - this has the binding values
+              const state = env.MESH_REQUEST_CONTEXT?.state as z.infer<TSchema>;
               return Event.execute(
                 events.handlers!,
                 input.context.events,
@@ -375,7 +363,7 @@ const toolsFor = <TSchema extends z.ZodTypeAny = never>({
           scopes: [
             ...(scopes ?? []),
             ...Event.scopes(events?.handlers ?? {}),
-            ...(busProp ? [`${busProp}::EVENT_SUBSCRIBE`] : []),
+            ...(busProp ? [`${busProp}::EVENT_SYNC_SUBSCRIPTIONS`] : []),
           ],
         });
       },