@decocms/runtime 1.0.0-alpha.38 → 1.0.0-alpha.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/runtime",
-  "version": "1.0.0-alpha.38",
+  "version": "1.0.0-alpha.39",
   "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.21",
+    "@decocms/bindings": "1.0.1-alpha.23",
     "@modelcontextprotocol/sdk": "1.20.2",
     "@ai-sdk/provider": "^2.0.0",
     "hono": "^4.10.7",

package/src/bindings.ts

@@ -31,11 +31,14 @@ export type BindingRegistry = Record<string, readonly ToolBinder[]>;
 /**
  * Function that returns Zod Schema
  */
-export const BindingOf = <TRegistry extends BindingRegistry>(
-  name: keyof TRegistry | "*",
+export const BindingOf = <
+  TRegistry extends BindingRegistry,
+  TName extends keyof TRegistry | "*",
+>(
+  name: TName,
 ) => {
   return z.object({
-    __type: z.literal(name).default(name as any),
+    __type: z.literal<TName>(name).default(name),
     value: z.string(),
   });
 };
@@ -84,10 +87,8 @@ export const isBinding = (v: unknown): v is Binding => {
   return (
     typeof v === "object" &&
     v !== null &&
-    "__type" in v &&
-    typeof v.__type === "string" &&
-    "value" in v &&
-    typeof v.value === "string"
+    typeof (v as { __type: string }).__type === "string" &&
+    typeof (v as { value: string }).value === "string"
   );
 };
 
@@ -169,9 +170,9 @@ export const initializeBindings = <
   TBindings extends BindingRegistry = BindingRegistry,
 >(
   ctx: RequestContext,
-): void => {
+): ResolvedBindings<T, TBindings> => {
   // resolves the state in-place
-  traverseAndReplace(ctx.state, ctx) as ResolvedBindings<T, TBindings>;
+  return traverseAndReplace(ctx.state, ctx) as ResolvedBindings<T, TBindings>;
 };
 
 interface DefaultRegistry extends BindingRegistry {

package/src/events.ts

@@ -184,28 +184,6 @@ const getEventTypesForBinding = <TEnv, TSchema extends z.ZodTypeAny>(
   return Object.keys(bindingHandler);
 };
 
-/**
- * Get scopes from event handlers for subscription
- */
-const scopesFromEvents = <TEnv, TSchema extends z.ZodTypeAny = never>(
-  handlers: EventHandlers<TEnv, TSchema>,
-): string[] => {
-  if (isGlobalHandler<TEnv>(handlers)) {
-    // Global handler - scopes are based on explicit events array
-    // Note: "*" binding means all bindings
-    return handlers.events.map((event) => `*::event@${event}`);
-  }
-
-  const scopes: string[] = [];
-  for (const binding of getBindingKeys(handlers)) {
-    const eventTypes = getEventTypesForBinding(handlers, binding);
-    for (const eventType of eventTypes) {
-      scopes.push(`${binding}::event@${eventType}`);
-    }
-  }
-  return scopes;
-};
-
 /**
  * Get subscriptions from event handlers and state
  * Returns flat array of { eventType, publisher } for EVENT_SYNC_SUBSCRIPTIONS
@@ -490,6 +468,5 @@ const executeEventHandlers = async <TEnv, TSchema extends z.ZodTypeAny>(
  */
 export const Event = {
   subscriptions: eventsSubscriptions,
-  scopes: scopesFromEvents,
   execute: executeEventHandlers,
 };

package/src/index.ts

@@ -214,7 +214,7 @@ export const withBindings = <TEnv>({
   }
 
   env.MESH_REQUEST_CONTEXT = context;
-  initializeBindings(context);
+  context.state = initializeBindings(context);
 
   withDefaultBindings({
     env,

package/src/tools.ts

@@ -279,7 +279,9 @@ const getEventBus = (
   env: DefaultEnv,
 ): EventBusBindingClient | undefined => {
   const bus = env as unknown as { [prop]: EventBusBindingClient };
-  return typeof bus[prop] !== "undefined" ? bus[prop] : undefined;
+  return typeof bus[prop] !== "undefined"
+    ? bus[prop]
+    : env?.MESH_REQUEST_CONTEXT.state[prop];
 };
 
 const toolsFor = <TSchema extends z.ZodTypeAny = never>({
@@ -291,7 +293,7 @@ const toolsFor = <TSchema extends z.ZodTypeAny = never>({
     : { type: "object", properties: {} };
   const busProp = String(events?.bus ?? "EVENT_BUS");
   return [
-    ...(onChange
+    ...(onChange || events
       ? [
           createTool({
             id: "ON_MCP_CONFIGURATION",
@@ -307,7 +309,7 @@ const toolsFor = <TSchema extends z.ZodTypeAny = never>({
             outputSchema: z.object({}),
             execute: async (input) => {
               const state = input.context.state as z.infer<TSchema>;
-              await onChange(input.runtimeContext.env, {
+              await onChange?.(input.runtimeContext.env, {
                 state,
                 scopes: input.context.scopes,
               });
@@ -361,7 +363,6 @@ const toolsFor = <TSchema extends z.ZodTypeAny = never>({
           stateSchema: jsonSchema,
           scopes: [
             ...((scopes as string[]) ?? []),
-            ...Event.scopes(events?.handlers ?? {}),
             ...(events ? [`${busProp}::EVENT_SYNC_SUBSCRIPTIONS`] : []),
           ],
         });