@celerity-sdk/core 0.4.0 → 0.6.0

package/dist/index.cjs

@@ -37,7 +37,7 @@ __export(index_exports, {
   BadGatewayException: () => BadGatewayException,
   BadRequestException: () => BadRequestException,
   Body: () => Body,
-  BucketEventType: () => import_types3.BucketEventType,
+  BucketEventType: () => import_types9.BucketEventType,
   CONSUMER_HANDLER_METADATA: () => CONSUMER_HANDLER_METADATA,
   CONSUMER_METADATA: () => CONSUMER_METADATA,
   CONTROLLER_METADATA: () => CONTROLLER_METADATA,
@@ -51,7 +51,7 @@ __export(index_exports, {
   Container: () => Container,
   Controller: () => Controller,
   Cookies: () => Cookies,
-  DatastoreEventType: () => import_types3.DatastoreEventType,
+  DatastoreEventType: () => import_types9.DatastoreEventType,
   Delete: () => Delete,
   EventInput: () => EventInput,
   EventType: () => EventType,
@@ -114,7 +114,7 @@ __export(index_exports, {
   ServerlessApplication: () => ServerlessApplication,
   ServiceUnavailableException: () => ServiceUnavailableException,
   SetMetadata: () => SetMetadata,
-  SourceType: () => import_types3.SourceType,
+  SourceType: () => import_types9.SourceType,
   TestingApplication: () => TestingApplication,
   Token: () => Token,
   TooManyRequestsException: () => TooManyRequestsException,
@@ -129,7 +129,7 @@ __export(index_exports, {
   WEBSOCKET_CONTROLLER_METADATA: () => WEBSOCKET_CONTROLLER_METADATA,
   WEBSOCKET_EVENT_METADATA: () => WEBSOCKET_EVENT_METADATA,
   WebSocketController: () => WebSocketController,
-  WebSocketSender: () => import_types2.WebSocketSender,
+  WebSocketSender: () => import_types8.WebSocketSender,
   bootstrap: () => bootstrap,
   bootstrapForRuntime: () => bootstrapForRuntime,
   buildModuleGraph: () => buildModuleGraph,
@@ -558,10 +558,10 @@ __name(EventType, "EventType");
 
 // src/decorators/consumer.ts
 var import_reflect_metadata12 = require("reflect-metadata");
-function Consumer(sourceId) {
+function Consumer(source) {
   return (target) => {
     const meta = {};
-    if (sourceId !== void 0) meta.sourceId = sourceId;
+    if (source !== void 0) meta.source = source;
     Reflect.defineMetadata(CONSUMER_METADATA, meta, target);
     Reflect.defineMetadata(INJECTABLE_METADATA, true, target);
   };
@@ -620,11 +620,11 @@ function parseScheduleArg(arg) {
     return isScheduleExpression(arg) ? {
       schedule: arg
     } : {
-      scheduleId: arg
+      source: arg
     };
   }
   const meta = {};
-  if (arg.scheduleId !== void 0) meta.scheduleId = arg.scheduleId;
+  if (arg.source !== void 0) meta.source = arg.source;
   if (arg.schedule !== void 0) meta.schedule = arg.schedule;
   return meta;
 }
@@ -1015,6 +1015,10 @@ __name(runLayerPipeline, "runLayerPipeline");
 // src/layers/system.ts
 var import_config = require("@celerity-sdk/config");
 var RESOURCE_LAYER_MAP = {
+  datastore: {
+    pkg: "@celerity-sdk/datastore",
+    className: "DatastoreLayer"
+  },
   bucket: {
     pkg: "@celerity-sdk/bucket",
     className: "ObjectStorageLayer"
@@ -1023,9 +1027,17 @@ var RESOURCE_LAYER_MAP = {
     pkg: "@celerity-sdk/queue",
     className: "QueueLayer"
   },
+  topic: {
+    pkg: "@celerity-sdk/topic",
+    className: "TopicLayer"
+  },
   cache: {
     pkg: "@celerity-sdk/cache",
     className: "CacheLayer"
+  },
+  sqlDatabase: {
+    pkg: "@celerity-sdk/sql-database",
+    className: "SqlDatabaseLayer"
   }
 };
 async function createDefaultSystemLayers() {
@@ -1503,6 +1515,7 @@ __name(matchRoute, "matchRoute");
 // src/bootstrap/module-graph.ts
 var import_reflect_metadata20 = require("reflect-metadata");
 var import_debug4 = __toESM(require("debug"), 1);
+var import_common2 = require("@celerity-sdk/common");
 var debug4 = (0, import_debug4.default)("celerity:core:bootstrap");
 function buildModuleGraph(rootModule) {
   const graph = /* @__PURE__ */ new Map();
@@ -1531,7 +1544,8 @@ function buildModuleGraph(rootModule) {
         controllers: [],
         functionHandlers: [],
         guards: [],
-        providers: []
+        providers: [],
+        layers: []
       });
       return;
     }
@@ -1573,7 +1587,8 @@ function buildModuleGraph(rootModule) {
       controllers,
       functionHandlers: metadata.functionHandlers ?? [],
       guards,
-      providers
+      providers,
+      layers: metadata.layers ?? []
     });
   }
   __name(walk, "walk");
@@ -1691,6 +1706,7 @@ function checkDependencies(consumer, depTokens, visibleTokens, moduleClass, grap
       checkDependencies(dep, adoptedDeps, visibleTokens, moduleClass, graph, container, diagnostics);
       continue;
     }
+    if ((0, import_common2.isResourceLayerToken)(dep)) continue;
     diagnostics.push({
       type: "missing_dependency",
       message: `${tokenToString(consumer)} in ${moduleClass.name} requires ${tokenToString(dep)} \u2014 no provider registered. Ensure the module providing it is included in your module's "imports" array, or register a provider for it directly.`
@@ -1711,15 +1727,15 @@ __name(findTokenOwner, "findTokenOwner");
 // src/handlers/scanners/http.ts
 var import_reflect_metadata21 = require("reflect-metadata");
 var import_debug5 = __toESM(require("debug"), 1);
-var import_common2 = require("@celerity-sdk/common");
+var import_common3 = require("@celerity-sdk/common");
 var debug5 = (0, import_debug5.default)("celerity:core:scanner:http");
 async function scanHttpHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler(controllerClass, container, registry);
+      await scanClassHandler(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler(fnHandler, registry);
+      scanFunctionHandler(fnHandler, registry, node.layers);
     }
   }
 }
@@ -1743,11 +1759,10 @@ async function scanModule(moduleClass, container, registry) {
   await scanHttpGuards(graph, container, registry);
 }
 __name(scanModule, "scanModule");
-async function scanClassHandler(controllerClass, container, registry) {
+async function scanClassHandler(controllerClass, container, registry, moduleLayers) {
   const controllerMeta = Reflect.getOwnMetadata(CONTROLLER_METADATA, controllerClass);
   if (!controllerMeta) return;
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classProtectedBy = Reflect.getOwnMetadata(GUARD_PROTECTEDBY_METADATA, controllerClass) ?? [];
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
@@ -1756,7 +1771,7 @@ async function scanClassHandler(controllerClass, container, registry) {
     const method = Reflect.getOwnMetadata(HTTP_METHOD_METADATA, prototype, methodName);
     if (!method) continue;
     const routePath = Reflect.getOwnMetadata(ROUTE_PATH_METADATA, prototype, methodName) ?? "/";
-    const fullPath = (0, import_common2.joinHandlerPath)(controllerMeta.prefix ?? "", routePath);
+    const fullPath = (0, import_common3.joinHandlerPath)(controllerMeta.prefix ?? "", routePath);
     const methodProtectedBy = Reflect.getOwnMetadata(GUARD_PROTECTEDBY_METADATA, prototype, methodName) ?? [];
     const methodLayers = Reflect.getOwnMetadata(LAYER_METADATA, prototype, methodName) ?? [];
     const paramMetadata = Reflect.getOwnMetadata(PARAM_METADATA, prototype, methodName) ?? [];
@@ -1765,6 +1780,7 @@ async function scanClassHandler(controllerClass, container, registry) {
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1789,15 +1805,16 @@ async function scanClassHandler(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler, "scanClassHandler");
-function scanFunctionHandler(definition, registry) {
+function scanFunctionHandler(definition, registry, moduleLayers) {
   if (definition.type !== "http") return;
   const meta = definition.metadata;
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -1830,8 +1847,7 @@ __name(scanFunctionHandler, "scanFunctionHandler");
 async function scanClassGuard(guardClass, container, registry) {
   const guardName = Reflect.getOwnMetadata(GUARD_CUSTOM_METADATA, guardClass);
   if (!guardName) return;
-  const instance = await container.resolve(guardClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = guardClass.prototype;
   const descriptor = Object.getOwnPropertyDescriptor(prototype, "check");
   if (!descriptor?.value || typeof descriptor.value !== "function") {
     debug5("scanClassGuard: %s has no check() method, skipping", guardClass.name);
@@ -1843,7 +1859,7 @@ async function scanClassGuard(guardClass, container, registry) {
   registry.registerGuard({
     name: guardName,
     handlerFn: descriptor.value,
-    handlerInstance: instance,
+    guardClass,
     paramMetadata,
     customMetadata
   });
@@ -1935,19 +1951,18 @@ var debug6 = (0, import_debug6.default)("celerity:core:scanner:websocket");
 async function scanWebSocketHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler2(controllerClass, container, registry);
+      await scanClassHandler2(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler2(fnHandler, registry);
+      scanFunctionHandler2(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanWebSocketHandlers, "scanWebSocketHandlers");
-async function scanClassHandler2(controllerClass, container, registry) {
+async function scanClassHandler2(controllerClass, container, registry, moduleLayers) {
   const isWsController = Reflect.getOwnMetadata(WEBSOCKET_CONTROLLER_METADATA, controllerClass);
   if (!isWsController) return;
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classProtectedBy = Reflect.getOwnMetadata(GUARD_PROTECTEDBY_METADATA, controllerClass) ?? [];
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
@@ -1963,6 +1978,7 @@ async function scanClassHandler2(controllerClass, container, registry) {
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     debug6("scanClassHandler: %s %s (%s.%s)", eventMeta.eventType, eventMeta.route, controllerClass.name, methodName);
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1984,15 +2000,16 @@ async function scanClassHandler2(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler2, "scanClassHandler");
-function scanFunctionHandler2(definition, registry) {
+function scanFunctionHandler2(definition, registry, moduleLayers) {
   if (definition.type !== "websocket") return;
   const meta = definition.metadata;
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -2024,19 +2041,18 @@ var debug7 = (0, import_debug7.default)("celerity:core:scanner:consumer");
 async function scanConsumerHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler3(controllerClass, container, registry);
+      await scanClassHandler3(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler3(fnHandler, registry);
+      scanFunctionHandler3(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanConsumerHandlers, "scanConsumerHandlers");
-async function scanClassHandler3(controllerClass, container, registry) {
+async function scanClassHandler3(controllerClass, container, registry, moduleLayers) {
   const consumerMeta = Reflect.getOwnMetadata(CONSUMER_METADATA, controllerClass);
   if (!consumerMeta) return;
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
   const classCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, controllerClass) ?? {};
@@ -2048,8 +2064,9 @@ async function scanClassHandler3(controllerClass, container, registry) {
     const methodCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, prototype, methodName) ?? {};
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
-    const handlerTag = handlerMeta.route ?? methodName;
+    const handlerTag = consumerMeta.source ? `${consumerMeta.source}::${methodName}` : methodName;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -2070,16 +2087,17 @@ async function scanClassHandler3(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler3, "scanClassHandler");
-function scanFunctionHandler3(definition, registry) {
+function scanFunctionHandler3(definition, registry, moduleLayers) {
   if (definition.type !== "consumer") return;
   const meta = definition.metadata;
-  const handlerTag = meta.route ?? definition.id ?? "default";
+  const handlerTag = definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.messageSchema) {
@@ -2109,17 +2127,16 @@ var debug8 = (0, import_debug8.default)("celerity:core:scanner:schedule");
 async function scanScheduleHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler4(controllerClass, container, registry);
+      await scanClassHandler4(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler4(fnHandler, registry);
+      scanFunctionHandler4(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanScheduleHandlers, "scanScheduleHandlers");
-async function scanClassHandler4(controllerClass, container, registry) {
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+async function scanClassHandler4(controllerClass, container, registry, moduleLayers) {
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
   const classCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, controllerClass) ?? {};
@@ -2131,8 +2148,9 @@ async function scanClassHandler4(controllerClass, container, registry) {
     const methodCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, prototype, methodName) ?? {};
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
-    const handlerTag = handlerMeta.scheduleId ?? methodName;
+    const handlerTag = handlerMeta.source ? `${handlerMeta.source}::${methodName}` : methodName;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -2154,21 +2172,22 @@ async function scanClassHandler4(controllerClass, container, registry) {
         ...handlerMeta.schedule ? {
           schedule: handlerMeta.schedule
         } : {},
-        ...handlerMeta.scheduleId ? {
-          scheduleId: handlerMeta.scheduleId
+        ...handlerMeta.source ? {
+          source: handlerMeta.source
         } : {}
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler4, "scanClassHandler");
-function scanFunctionHandler4(definition, registry) {
+function scanFunctionHandler4(definition, registry, moduleLayers) {
   if (definition.type !== "schedule") return;
   const meta = definition.metadata;
-  const handlerTag = meta.scheduleId ?? definition.id ?? "default";
+  const handlerTag = meta.source ?? definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -2180,7 +2199,7 @@ function scanFunctionHandler4(definition, registry) {
     ...meta.customMetadata ?? {}
   };
   if (meta.schedule) customMetadata.schedule = meta.schedule;
-  if (meta.scheduleId) customMetadata.scheduleId = meta.scheduleId;
+  if (meta.source) customMetadata.source = meta.source;
   debug8("scanFunctionHandler: tag=%s", handlerTag);
   registry.register({
     type: "schedule",
@@ -2203,17 +2222,16 @@ var debug9 = (0, import_debug9.default)("celerity:core:scanner:custom");
 async function scanCustomHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler5(controllerClass, container, registry);
+      await scanClassHandler5(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler5(fnHandler, registry);
+      scanFunctionHandler5(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanCustomHandlers, "scanCustomHandlers");
-async function scanClassHandler5(controllerClass, container, registry) {
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+async function scanClassHandler5(controllerClass, container, registry, moduleLayers) {
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
   const classCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, controllerClass) ?? {};
@@ -2226,6 +2244,7 @@ async function scanClassHandler5(controllerClass, container, registry) {
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -2246,16 +2265,17 @@ async function scanClassHandler5(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler5, "scanClassHandler");
-function scanFunctionHandler5(definition, registry) {
+function scanFunctionHandler5(definition, registry, moduleLayers) {
   if (definition.type !== "custom") return;
   const meta = definition.metadata;
   const name = meta.name ?? definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -2452,6 +2472,28 @@ function buildHttpContext(request, metadata, container, logger) {
 }
 __name(buildHttpContext, "buildHttpContext");
 
+// src/handlers/types.ts
+async function resolveHandlerInstance(handler, container) {
+  if (handler.handlerInstance) return handler.handlerInstance;
+  if (!handler.controllerClass) {
+    throw new Error("Handler has no controllerClass for deferred resolution");
+  }
+  const instance = await container.resolve(handler.controllerClass);
+  handler.handlerInstance = instance;
+  return instance;
+}
+__name(resolveHandlerInstance, "resolveHandlerInstance");
+async function resolveGuardInstance(guard, container) {
+  if (guard.handlerInstance) return guard.handlerInstance;
+  if (!guard.guardClass) {
+    throw new Error("Guard has no guardClass for deferred resolution");
+  }
+  const instance = await container.resolve(guard.guardClass);
+  guard.handlerInstance = instance;
+  return instance;
+}
+__name(resolveGuardInstance, "resolveGuardInstance");
+
 // src/handlers/http-pipeline.ts
 var debug12 = (0, import_debug12.default)("celerity:core:pipeline");
 async function executeHttpPipeline(handler, request, options) {
@@ -2502,6 +2544,9 @@ async function executeHttpPipeline(handler, request, options) {
         error: message,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2527,7 +2572,8 @@ async function invokeClassHandler(handler, context) {
   for (const meta of sorted) {
     args[meta.index] = extractValidatedParam(meta.type, meta.key, context.request, context.metadata);
   }
-  return handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler, "invokeClassHandler");
 var VALIDATED_METADATA_KEYS = {
@@ -2626,6 +2672,9 @@ async function executeWebSocketPipeline(handler, message, options) {
         eventType: message.eventType,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2642,7 +2691,8 @@ async function invokeClassHandler2(handler, context) {
   for (const meta of sorted) {
     args[meta.index] = extractWebSocketParam(meta, context);
   }
-  await handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  await handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler2, "invokeClassHandler");
 async function invokeFunctionHandler2(handler, context) {
@@ -2740,6 +2790,9 @@ async function executeConsumerPipeline(handler, event, options) {
         messageCount: event.messages.length,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2761,7 +2814,8 @@ async function invokeClassHandler3(handler, context, validatedMessages, rawMessa
   for (const meta of sorted) {
     args[meta.index] = extractConsumerParam(meta, context, validatedMessages, rawMessages);
   }
-  return await handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return await handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler3, "invokeClassHandler");
 async function invokeFunctionHandler3(handler, context, validatedMessages, _rawMessages) {
@@ -2834,6 +2888,9 @@ async function executeSchedulePipeline(handler, event, options) {
         scheduleId: event.scheduleId,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2855,7 +2912,8 @@ async function invokeClassHandler4(handler, context, validatedInput) {
   for (const meta of sorted) {
     args[meta.index] = extractScheduleParam(meta, context, validatedInput);
   }
-  return await handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return await handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler4, "invokeClassHandler");
 async function invokeFunctionHandler4(handler, context, _validatedInput) {
@@ -2926,7 +2984,8 @@ async function invokeClassHandler5(handler, context, validatedPayload) {
   for (const meta of sorted) {
     args[meta.index] = extractCustomParam(meta, context, validatedPayload);
   }
-  return handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler5, "invokeClassHandler");
 async function invokeFunctionHandler5(handler, context, validatedPayload) {
@@ -3283,7 +3342,7 @@ function createScheduleHandler(configOrString, configOrHandler, maybeHandler) {
     if (isScheduleExpression2(configOrString)) {
       config.schedule = configOrString;
     } else {
-      config.scheduleId = configOrString;
+      config.source = configOrString;
     }
   } else {
     config = configOrString;
@@ -3294,7 +3353,7 @@ function createScheduleHandler(configOrString, configOrHandler, maybeHandler) {
     inject: config.inject ?? [],
     customMetadata: config.metadata ?? {}
   };
-  if (config.scheduleId !== void 0) metadata.scheduleId = config.scheduleId;
+  if (config.source !== void 0) metadata.source = config.source;
   if (config.schedule !== void 0) metadata.schedule = config.schedule;
   if (config.schema !== void 0) metadata.schema = config.schema;
   return {
@@ -3417,7 +3476,7 @@ function buildResolvedFromExport(handlerId, handlerType, handlerFn, fnDef) {
       return {
         ...base,
         type: "schedule",
-        handlerTag: meta?.scheduleId ?? handlerId
+        handlerTag: meta?.source ?? handlerId
       };
     case "custom":
       return {
@@ -3536,7 +3595,8 @@ async function invokeClassGuard(guard, input, metadata, options, logger) {
       args[i] = guardContext;
     }
   }
-  return guard.handlerFn.apply(guard.handlerInstance, args);
+  const instance = await resolveGuardInstance(guard, options.container);
+  return guard.handlerFn.apply(instance, args);
 }
 __name(invokeClassGuard, "invokeClassGuard");
 async function invokeFunctionGuard(guard, input, metadata, options, logger) {
@@ -3856,7 +3916,7 @@ async function bootstrapForRuntime(modulePath, systemLayers) {
 __name(bootstrapForRuntime, "bootstrapForRuntime");
 
 // src/bootstrap/runtime-orchestrator.ts
-var import_types = require("@celerity-sdk/types");
+var import_types7 = require("@celerity-sdk/types");
 async function loadRuntime() {
   const pkg = "@celerity-sdk/runtime";
   const runtimeModule = await import(pkg);
@@ -3928,22 +3988,37 @@ __name(registerWebSocketHandlers, "registerWebSocketHandlers");
 async function registerConsumerHandlers(app, consumers, result) {
   for (const consumer of consumers?.consumers ?? []) {
     for (const def of consumer.handlers) {
-      const tag = `source::${consumer.sourceId}::${def.name}`;
-      const callback = result.createConsumerCallback(tag, def.name) ?? await result.createConsumerCallbackById(def.handler, def.location, def.name);
+      const methodName = def.handler.split(".").pop() ?? def.name;
+      const lookupKey = `${consumer.consumerName}::${methodName}`;
+      const callback = result.createConsumerCallback(lookupKey, def.name) ?? await result.createConsumerCallbackById(def.handler, def.location, def.name);
       if (callback) {
-        app.registerConsumerHandler(tag, def.timeout, callback);
+        app.registerConsumerHandler(def.name, def.timeout, callback);
       }
     }
   }
 }
 __name(registerConsumerHandlers, "registerConsumerHandlers");
+async function registerEventHandlers(app, events, result) {
+  for (const event of events?.events ?? []) {
+    for (const def of event.handlers) {
+      const methodName = def.handler.split(".").pop() ?? def.name;
+      const lookupKey = `${event.consumerName}::${methodName}`;
+      const callback = result.createConsumerCallback(lookupKey, def.name) ?? await result.createConsumerCallbackById(def.handler, def.location, def.name);
+      if (callback) {
+        app.registerConsumerHandler(def.name, def.timeout, callback);
+      }
+    }
+  }
+}
+__name(registerEventHandlers, "registerEventHandlers");
 async function registerScheduleHandlers(app, schedules, result) {
   for (const schedule of schedules?.schedules ?? []) {
     for (const def of schedule.handlers) {
-      const tag = `source::${schedule.scheduleId}::${def.name}`;
-      const callback = result.createScheduleCallback(tag, def.name) ?? await result.createScheduleCallbackById(def.handler, def.location, def.name);
+      const methodName = def.handler.split(".").pop() ?? def.name;
+      const lookupKey = `${schedule.scheduleId}::${methodName}`;
+      const callback = result.createScheduleCallback(lookupKey, def.name) ?? await result.createScheduleCallbackById(def.handler, def.location, def.name);
       if (callback) {
-        app.registerScheduleHandler(tag, def.timeout, callback);
+        app.registerScheduleHandler(def.name, def.timeout, callback);
       }
     }
   }
@@ -3965,11 +4040,12 @@ async function startRuntime(options) {
   await registerGuardHandlers(app, appConfig.api?.guards, result);
   await registerWebSocketHandlers(app, appConfig.api?.websocket, result);
   await registerConsumerHandlers(app, appConfig.consumers, result);
+  await registerEventHandlers(app, appConfig.events, result);
   await registerScheduleHandlers(app, appConfig.schedules, result);
   await registerCustomHandlers(app, appConfig.customHandlers, result);
   if (appConfig.api?.websocket) {
     const sender = new RuntimeWebSocketSender(app.websocketRegistry());
-    result.container.register(import_types.WebSocketSender, {
+    result.container.register(import_types7.WebSocketSender, {
       useValue: sender
     });
   }
@@ -3978,8 +4054,8 @@ async function startRuntime(options) {
 __name(startRuntime, "startRuntime");
 
 // src/index.ts
-var import_types2 = require("@celerity-sdk/types");
-var import_types3 = require("@celerity-sdk/types");
+var import_types8 = require("@celerity-sdk/types");
+var import_types9 = require("@celerity-sdk/types");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   APP_CONFIG,