@reventlessdev/reventless-aws 3.0.0-alpha.220 → 3.0.0-alpha.221

package/src/adapter/QueryDb/QueryDbStorage_DynamoDbStream.res

@@ -14,10 +14,10 @@ let make: ReventlessCore.QueryDb_Adapter.storageMaker<api, role> = (
   ~ttl=?,
   ~api,
   ~apiRole,
-  ~opts,
+  ~owner, ~opts,
 ) => {
   streamRegistry->Set.add(name)
-  let tags = AWS.Tags.make(~name, ReventlessCore.QueryDb.componentType)
+  let tags = AWS.Tags.make(~name, ~kind=ReventlessCore.QueryDb.componentType, ~role=QueryDb, ~owner?)
   let table = Util_DynamoDbStream.makeTable(
     name,
     ~attributes=attributes(subIdField, indexes),

package/src/adapter/QueryDb/QueryDbStorage_DynamoDbStream.res.mjs

@@ -9,9 +9,9 @@ import * as QueryDbStorage_DynamoDb_Runtime$ReventlessAws from "./QueryDbStorage
 
 let streamRegistry = new Set();
 
-function make(name, indexes, subIdField, ttl, api, apiRole, opts) {
+function make(name, indexes, subIdField, ttl, api, apiRole, owner, opts) {
   streamRegistry.add(name);
-  let tags = AWS_Tags$ReventlessAws.make(name, QueryDb$ReventlessCore.componentType);
+  let tags = AWS_Tags$ReventlessAws.make(name, QueryDb$ReventlessCore.componentType, "QueryDb", undefined, undefined, owner, undefined, undefined);
   let table = Util_DynamoDbStream$ReventlessAws.makeTable(QueryDbStorage_DynamoDb$ReventlessAws.attributes(subIdField, indexes), QueryDbStorage_DynamoDb$ReventlessAws.globalSecondaryIndexes(indexes), ttl, subIdField, "NEW_AND_OLD_IMAGES", tags, opts, name);
   return {
     resources: [

package/src/adapter/QueryDb/QueryDbStorage_Postgres.res

@@ -24,7 +24,7 @@ let make: ReventlessCore.QueryDb_Adapter.storageMaker<api, role> = (
   ~ttl as _=?,
   ~api as _,
   ~apiRole as _,
-  ~opts as _,
+  ~owner as _, ~opts as _,
 ) => {
   let operations = switch QueryDbBackend.get() {
   | Some({connectionConfig}) =>

package/src/adapter/QueryDb/QueryDbStorage_Postgres.res.mjs

@@ -5,7 +5,7 @@ import * as QueryDbBackend$ReventlessAws from "./QueryDbBackend.res.mjs";
 import * as PgQueryResolver_Builder$ReventlessAws from "./PgQueryResolver_Builder.res.mjs";
 import * as QueryDbStorage_Postgres_Runtime$ReventlessAws from "./QueryDbStorage_Postgres_Runtime.res.mjs";
 
-function make(name, indexes, subIdField, param, param$1, param$2, param$3) {
+function make(name, indexes, subIdField, param, param$1, param$2, param$3, param$4) {
   let match = QueryDbBackend$ReventlessAws.get();
   let operations = match !== undefined ? match.connectionConfig.apply(config => QueryDbStorage_Postgres_Runtime$ReventlessAws.opsFor(config, name, indexes, subIdField)) : Stdlib_JsError.throwWithMessage("QueryDbStorage_Postgres.make called without a QueryDbBackend selection");
   return {

package/src/adapter/Runtime/AdminEventCollectorEntryPoint.mjs

@@ -65,8 +65,17 @@
 import { readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
-import * as Effect from "effect/Effect";
-import { patchSpecId, makeQueueRef, scanByTableName, log, pluginName } from "./HandlerFactoryHelpers.mjs";
+import {
+  patchSpecId,
+  makeQueueRef,
+  scanByTableName,
+  log,
+  runEffect,
+  setRequestId,
+  extractMetaField,
+  extractSentTimestamp,
+  extractRetryCount,
+} from "./HandlerFactoryHelpers.mjs";
 import { subscribeQueueToTopic, unsubscribeQueueFromTopic } from "@reventlessdev/rescript-aws-sdk/src/SNS_Helpers.res.mjs";
 import { sendMessage } from "@reventlessdev/reventless-aws/src/plugin/runtime/Util_PluginMessage_Runtime.res.mjs";
 import { publish as snsPublish } from "@reventlessdev/reventless-aws/src/adapter/EventTopic/EventTopicPublisher_SNS_Runtime.res.mjs";
@@ -81,7 +90,6 @@ import { createSchedule as cwCreateSchedule, deleteSchedule as cwDeleteSchedule
 import {
   decode as decodeFragment,
 } from "@reventlessdev/reventless-core/src/components/Api/GraphQL_Stitcher.res.mjs";
-import { tag as requestContextTag } from "@reventlessdev/reventless-core/src/RequestContext.res.mjs";
 
 // The Plugin RM state schema uses `@s.matches(_jsNullable …)` for many
 // optional fields — top-level AND nested. DDB writes drop undefined
@@ -173,39 +181,6 @@ function parseHandlerConfig(rawJson) {
   return config;
 }
 
-// Set at handler entry; read by runEffect to tag logs with the Lambda request id.
-let _currentRequestId = "unknown";
-
-function runEffect(correlationId, effect) {
-  let e = effect
-    // Promote correlationId/requestId/plugin to top-level JSON log fields —
-    // decoded by EffectLogger.install() from Effect log annotations. Harmless
-    // no-op if the unified logger isn't installed.
-    .pipe(Effect.annotateLogs("correlationId", correlationId || "unknown"))
-    .pipe(Effect.annotateLogs("requestId", _currentRequestId));
-  if (pluginName) e = e.pipe(Effect.annotateLogs("plugin", pluginName));
-  return e
-    .pipe(Effect.provideService(requestContextTag, { correlationId: correlationId || "unknown" }))
-    .pipe(Effect.runPromise);
-}
-
-function extractCorrelationId(records) {
-  const first = records && records[0];
-  if (!first) return undefined;
-  const body = first.body;
-  if (!body) return undefined;
-  try {
-    const parsed = JSON.parse(body);
-    if (parsed && typeof parsed === "object") {
-      const meta = parsed.meta;
-      if (meta && typeof meta === "object" && typeof meta.correlationId === "string") {
-        return meta.correlationId;
-      }
-    }
-  } catch (_) {}
-  return undefined;
-}
-
 const invalidNameChars = /[^.\-_a-zA-Z0-9]/g;
 const resourceNaming = {
   validateName: (n) => n.replace(invalidNameChars, "_"),
@@ -714,17 +689,25 @@ async function buildHandler() {
   await reconcileSubscriptionsOnce(config.pluginReadModelTableName, manageSubscriptionsFn);
 
   const sqsHandler = handleDynamoDbOrSqsEvent(makeQueueRef(config.queueUrl), callback.handleJsonEvents);
-  return { sqsHandler };
+  // This module backs both the admin and every per-plugin EventCollector
+  // Lambda, so the comp names the plugin whose events it drains — matching the
+  // `Plugin(<id>)` shape Plugin_Callback logs under.
+  return { sqsHandler, comp: `Plugin(${pluginDefinition.id})` };
 }
 
 const handlerBundlePromise = buildHandler();
 
 export async function handler(event, context) {
-  _currentRequestId = context?.awsRequestId || "unknown";
+  setRequestId(context?.awsRequestId);
   const records = event.Records || [];
-  const correlationId = extractCorrelationId(records);
   log.debug("processing " + records.length.toString() + " record(s)", { comp: "PluginEventCollectorRuntime" });
-  const { sqsHandler } = await handlerBundlePromise;
-  await runEffect(correlationId, sqsHandler(event, context));
+  const { sqsHandler, comp } = await handlerBundlePromise;
+  await runEffect(sqsHandler(event, context), {
+    correlationId: extractMetaField(records, "correlationId"),
+    causationId: extractMetaField(records, "causationId"),
+    comp,
+    timestamp: extractSentTimestamp(records),
+    retryCount: extractRetryCount(records),
+  });
   return "";
 }

package/src/adapter/Runtime/AggregateEntryPoint.mjs

@@ -3,9 +3,16 @@
 // wires EventLog_Operations, Aggregate_Callback, CommandTopic_Callback.
 // Handles both SQS CommandTopic events (Route 2) and AppSync direct invocation (Route 1).
 
-import * as Effect from "effect/Effect";
-import { patchSpecId, makeQueueRef, log, pluginName } from "./HandlerFactoryHelpers.mjs";
-import { tag as requestContextTag } from "@reventlessdev/reventless-core/src/RequestContext.res.mjs";
+import {
+  patchSpecId,
+  makeQueueRef,
+  log,
+  runEffect,
+  setRequestId,
+  extractMetaField,
+  extractSentTimestamp,
+  extractRetryCount,
+} from "./HandlerFactoryHelpers.mjs";
 import { Make as eventLogOperationsMake } from "@reventlessdev/reventless-core/src/components/EventLog/EventLog_Operations.res.mjs";
 import { Make as aggregateCallbackMake } from "@reventlessdev/reventless-core/src/components/Aggregate/Aggregate_Callback.res.mjs";
 import { Make as commandTopicCallbackMake } from "@reventlessdev/reventless-core/src/components/CommandTopic/CommandTopic_Callback.res.mjs";
@@ -192,21 +199,12 @@ function buildCommandGeneratorHandler(parts, dispatchMode) {
   };
 }
 
-// Set at handler entry; read by runEffect to tag logs with the Lambda request id.
-let _currentRequestId = "unknown";
-
-function runEffect(correlationId, effect) {
-  let e = effect
-    // Promote correlationId/requestId/plugin to top-level JSON log fields —
-    // decoded by EffectLogger.install() from Effect log annotations. Harmless
-    // no-op if the unified logger isn't installed.
-    .pipe(Effect.annotateLogs("correlationId", correlationId || "unknown"))
-    .pipe(Effect.annotateLogs("requestId", _currentRequestId));
-  if (pluginName) e = e.pipe(Effect.annotateLogs("plugin", pluginName));
-  return e
-    .pipe(Effect.provideService(requestContextTag, { correlationId: correlationId || "unknown" }))
-    .pipe(Effect.runPromise);
-}
+// The dispatch `comp`, matching the ReScript boundary's
+// `AggregateRuntime(<aggregateName>)` (AggregateRuntime_Builder_Common). Derived
+// in-shell rather than baked into HANDLER_CONFIG because the aggregate name is
+// already in hand here — unlike the event-collector resource name the read-model
+// entry point has to be handed.
+const aggregateComp = (aggregateName) => `AggregateRuntime(${aggregateName})`;
 
 function groupBySource(records) {
   const dict = {};
@@ -218,24 +216,6 @@ function groupBySource(records) {
   return dict;
 }
 
-function extractCorrelationId(records) {
-  const first = records[0];
-  if (!first) return undefined;
-  const body = first.body;
-  if (body == null) return undefined;
-  try {
-    const parsed = JSON.parse(body);
-    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-      const meta = parsed.meta;
-      if (meta && typeof meta === "object" && !Array.isArray(meta)) {
-        const cid = meta.correlationId;
-        if (typeof cid === "string") return cid;
-      }
-    }
-  } catch (_) {}
-  return undefined;
-}
-
 // DISPATCH_MODE controls whether AppSync direct-invoke commands are run inline
 // (sync, default) or pushed to SQS for asynchronous processing (async).
 // Aggregate_Builder_Single bundles this entry point with sync; the async
@@ -257,8 +237,20 @@ export async function buildHandlersForConfig(config, opts = {}) {
     const specModule = await loadModule(h.specModule);
     const behaviorModule = await loadModule(h.behaviorModule);
     const parts = buildAggregateParts(specModule, behaviorModule, h.eventLogTable, h.queueUrl, h.pgConnection);
-    cmdTopicHandlers[h.queueArn] = parts.sqsHandler;
-    cmdGenHandlers[specModule.name] = buildCommandGeneratorHandler(parts, dispatchMode);
+    // Pair each handler with the comp of the aggregate it belongs to: this
+    // Lambda can host every aggregate in the platform, so the comp is what keeps
+    // their log lines separable.
+    const comp = aggregateComp(specModule.name);
+    // `plugin` is resolved at deploy time (Util_LogAttribution) — this Lambda can
+    // host aggregates from several plugins, so its own name carries no plugin
+    // identity to fall back on.
+    const plugin = h.plugin;
+    cmdTopicHandlers[h.queueArn] = { handler: parts.sqsHandler, comp, plugin };
+    cmdGenHandlers[specModule.name] = {
+      handler: buildCommandGeneratorHandler(parts, dispatchMode),
+      comp,
+      plugin,
+    };
   }));
   return [cmdTopicHandlers, cmdGenHandlers];
 }
@@ -271,7 +263,7 @@ async function buildAllHandlers() {
 const initPromise = buildAllHandlers();
 
 export async function handler(event, context) {
-  _currentRequestId = context?.awsRequestId || "unknown";
+  setRequestId(context?.awsRequestId);
   const [cmdTopicHandlers, cmdGenHandlers] = await initPromise;
 
   // Route 1: AppSync direct invocation
@@ -290,9 +282,17 @@ export async function handler(event, context) {
     let result = null;
     let found = false;
     while (i < len && !found) {
-      const [name, cmdGenHandler] = entries[i];
+      const [name, { handler: cmdGenHandler, comp, plugin }] = entries[i];
       try {
-        const r = await runEffect(undefined, cmdGenHandler(event, context));
+        // Route 1 carries its envelope on `event.meta` (AppSync direct invoke),
+        // not in an SQS record — and there is no send time or receive count on
+        // this path, so latency/retry fields stay absent rather than faked.
+        const r = await runEffect(cmdGenHandler(event, context), {
+          correlationId: event.meta?.correlationId,
+          causationId: event.meta?.causationId,
+          comp,
+          plugin,
+        });
         log.debug("processed command via " + name, { comp: "CommandGenerator" });
         result = r;
         found = true;
@@ -313,13 +313,20 @@ export async function handler(event, context) {
 
   // Route 2: SQS CommandTopic events
   const records = event.Records || [];
-  const correlationId = extractCorrelationId(records);
   const grouped = groupBySource(records);
   await Promise.all(Object.entries(grouped).map(async ([arn, subRecords]) => {
-    const cmdHandler = cmdTopicHandlers[arn];
-    if (cmdHandler !== undefined) {
+    const registered = cmdTopicHandlers[arn];
+    if (registered !== undefined) {
+      const { handler: cmdHandler, comp, plugin } = registered;
       log.debug("found handler for CommandTopic " + arn, { comp: "AggregateRuntime" });
-      await runEffect(correlationId, cmdHandler({ Records: subRecords }, context));
+      await runEffect(cmdHandler({ Records: subRecords }, context), {
+        correlationId: extractMetaField(subRecords, "correlationId"),
+        causationId: extractMetaField(subRecords, "causationId"),
+        comp,
+        plugin,
+        timestamp: extractSentTimestamp(subRecords),
+        retryCount: extractRetryCount(subRecords),
+      });
     } else {
       log.warn("no handler found: " + arn, { comp: "AggregateRuntime" });
     }

package/src/adapter/Runtime/AggregateRuntime_Builder_Micro.res

@@ -204,10 +204,17 @@ let finish = () =>
             info.behaviorModulePath->JSON.stringifyAny->Option.getOr(`""`)
 
           // --- CommandTopic Lambda ---
+// `plugin` cannot be resolved inside the Lambda — LogPrefix's registry is a
+          // deploy-time structure, and the Lambda-name fallback yields nothing for a
+          // shared or per-aggregate command handler. Resolve it here; the shell still
+          // derives `comp` itself from the spec name.
+          let pluginFragment = Util_LogAttribution.pluginFragment(
+            ~comp=`AggregateRuntime(${spec.aggregateName})`,
+          )
           let cmdTopicHandlerConfigOutput =
             Pulumi.Output.all3((info.eventLogTableName, spec.queueUrl, spec.queueArn))
             ->Pulumi.Output.apply(((table, queueUrl, queueArn)) =>
-              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"}]}`
+              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"${pluginFragment}}]}`
             )
 
           let cmdTopicEnvVars: dict<Pulumi.Input.t<string>> = Dict.make()
@@ -222,6 +229,7 @@ let finish = () =>
           let cmdTopicRuntime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
             ~name=cmdTopicName,
             ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+            ~componentKind=ReventlessCore.ComponentType.Aggregate,
             ~code=cmdTopicCode,
             ~sourceCodeHash=cmdTopicSourceCodeHash,
             ~envVars=cmdTopicEnvVars,
@@ -234,10 +242,17 @@ let finish = () =>
 
           // --- CommandGenerator Lambda ---
           if spec.commandGeneratorConnects->Array.length > 0 {
+// `plugin` cannot be resolved inside the Lambda — LogPrefix's registry is a
+            // deploy-time structure, and the Lambda-name fallback yields nothing for a
+            // shared or per-aggregate command handler. Resolve it here; the shell still
+            // derives `comp` itself from the spec name.
+            let pluginFragment = Util_LogAttribution.pluginFragment(
+              ~comp=`AggregateRuntime(${spec.aggregateName})`,
+            )
             let cmdGenHandlerConfigOutput =
               Pulumi.Output.all3((info.eventLogTableName, spec.queueUrl, spec.queueArn))
               ->Pulumi.Output.apply(((table, queueUrl, queueArn)) =>
-                `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"}]}`
+                `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"${pluginFragment}}]}`
               )
 
             let cmdGenEnvVars: dict<Pulumi.Input.t<string>> = Dict.make()
@@ -252,6 +267,7 @@ let finish = () =>
             let cmdGenRuntime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
               ~name=cmdGenName,
               ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+              ~componentKind=ReventlessCore.ComponentType.Aggregate,
               ~code=cmdGenCode,
               ~sourceCodeHash=cmdGenSourceCodeHash,
               ~envVars=cmdGenEnvVars,
@@ -297,6 +313,7 @@ let finish = () =>
             let evtMapperRuntime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
               ~name=evtMapperName,
               ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+              ~componentKind=ReventlessCore.ComponentType.Aggregate,
               ~code=evtMapperCode,
               ~sourceCodeHash=evtMapperSourceCodeHash,
               ~envVars=evtMapperEnvVars,

package/src/adapter/Runtime/AggregateRuntime_Builder_Micro.res.mjs

@@ -8,6 +8,7 @@ import * as Aggregate$ReventlessCore from "@reventlessdev/reventless-core/src/co
 import * as Component$ReventlessCore from "@reventlessdev/reventless-core/src/components/Component.res.mjs";
 import * as Util_Bundle$ReventlessAws from "../../util/Util_Bundle.res.mjs";
 import * as ComponentType$ReventlessCore from "@reventlessdev/reventless-core/src/ComponentType.res.mjs";
+import * as Util_LogAttribution$ReventlessAws from "../../util/Util_LogAttribution.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "./RuntimeEnvironment_Lambda.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 
@@ -164,28 +165,30 @@ function finish() {
       packageDirs[behaviorPkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(behaviorPkg);
       let specModule = Stdlib_Option.getOr(JSON.stringify(info.specModulePath), `""`);
       let behaviorModule = Stdlib_Option.getOr(JSON.stringify(info.behaviorModulePath), `""`);
+      let pluginFragment = Util_LogAttribution$ReventlessAws.pluginFragment(`AggregateRuntime(` + spec.aggregateName + `)`);
       let cmdTopicHandlerConfigOutput = Pulumi.all([
         info.eventLogTableName,
         spec.queueUrl,
         spec.queueArn
-      ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"}]}`);
+      ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"` + pluginFragment + `}]}`);
       let cmdTopicEnvVars = {};
       cmdTopicEnvVars["HANDLER_CONFIG"] = cmdTopicHandlerConfigOutput;
       let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/AggregateEntryPoint.mjs", packageDirs, undefined);
       let cmdTopicName = baseName + "CmdHandler";
-      let cmdTopicRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdTopicName, "CommandHandler", match.code, match.sourceCodeHash, cmdTopicEnvVars, Math.max(spec.commandTopicMemorySize, 1024), Math.max(spec.commandTopicTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
+      let cmdTopicRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdTopicName, "CommandHandler", "Aggregate", match.code, match.sourceCodeHash, cmdTopicEnvVars, Math.max(spec.commandTopicMemorySize, 1024), Math.max(spec.commandTopicTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
       spec.commandTopicConnects.forEach(connect => connect(cmdTopicRuntime));
       if (spec.commandGeneratorConnects.length !== 0) {
+        let pluginFragment$1 = Util_LogAttribution$ReventlessAws.pluginFragment(`AggregateRuntime(` + spec.aggregateName + `)`);
         let cmdGenHandlerConfigOutput = Pulumi.all([
           info.eventLogTableName,
           spec.queueUrl,
           spec.queueArn
-        ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"}]}`);
+        ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"` + pluginFragment$1 + `}]}`);
         let cmdGenEnvVars = {};
         cmdGenEnvVars["HANDLER_CONFIG"] = cmdGenHandlerConfigOutput;
         let match$1 = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/AggregateEntryPoint.mjs", packageDirs, undefined);
         let cmdGenName = baseName + "CmdGen";
-        let cmdGenRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdGenName, "CommandHandler", match$1.code, match$1.sourceCodeHash, cmdGenEnvVars, Math.max(spec.commandGeneratorMemorySize, 1024), Math.max(spec.commandGeneratorTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
+        let cmdGenRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdGenName, "CommandHandler", "Aggregate", match$1.code, match$1.sourceCodeHash, cmdGenEnvVars, Math.max(spec.commandGeneratorMemorySize, 1024), Math.max(spec.commandGeneratorTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
         spec.commandGeneratorConnects.forEach(connect => connect(cmdGenRuntime));
       }
       let match$2 = spec.eventCollectorChannelSpec;
@@ -208,7 +211,7 @@ function finish() {
       evtMapperPackageDirs[mappingsPkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(mappingsPkg);
       let match$4 = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/EventMapperEntryPoint.mjs", evtMapperPackageDirs, undefined);
       let evtMapperName = baseName + "EventMapper";
-      let evtMapperRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(evtMapperName, "CommandHandler", match$4.code, match$4.sourceCodeHash, evtMapperEnvVars, Math.max(spec.eventCollectorMemorySize, 2048), Math.max(spec.eventCollectorTimeout, 180), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
+      let evtMapperRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(evtMapperName, "CommandHandler", "Aggregate", match$4.code, match$4.sourceCodeHash, evtMapperEnvVars, Math.max(spec.eventCollectorMemorySize, 2048), Math.max(spec.eventCollectorTimeout, 180), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
       EventCollectorChannel_DynamoDbStream$ReventlessAws.connect(evtMapperName, [match$2], evtMapperRuntime, aggregateOpts);
     });
   }

package/src/adapter/Runtime/AggregateRuntime_Builder_Micro_Async.res

@@ -207,10 +207,17 @@ let finish = () =>
             info.behaviorModulePath->JSON.stringifyAny->Option.getOr(`""`)
 
           // --- CommandTopic Lambda ---
+// `plugin` cannot be resolved inside the Lambda — LogPrefix's registry is a
+          // deploy-time structure, and the Lambda-name fallback yields nothing for a
+          // shared or per-aggregate command handler. Resolve it here; the shell still
+          // derives `comp` itself from the spec name.
+          let pluginFragment = Util_LogAttribution.pluginFragment(
+            ~comp=`AggregateRuntime(${spec.aggregateName})`,
+          )
           let cmdTopicHandlerConfigOutput =
             Pulumi.Output.all3((info.eventLogTableName, spec.queueUrl, spec.queueArn))
             ->Pulumi.Output.apply(((table, queueUrl, queueArn)) =>
-              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"}]}`
+              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"${pluginFragment}}]}`
             )
 
           let cmdTopicEnvVars: dict<Pulumi.Input.t<string>> = Dict.make()
@@ -225,6 +232,7 @@ let finish = () =>
           let cmdTopicRuntime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
             ~name=cmdTopicName,
             ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+            ~componentKind=ReventlessCore.ComponentType.Aggregate,
             ~code=cmdTopicCode,
             ~sourceCodeHash=cmdTopicSourceCodeHash,
             ~envVars=cmdTopicEnvVars,
@@ -237,10 +245,17 @@ let finish = () =>
 
           // --- CommandGenerator Lambda ---
           if spec.commandGeneratorConnects->Array.length > 0 {
+// `plugin` cannot be resolved inside the Lambda — LogPrefix's registry is a
+            // deploy-time structure, and the Lambda-name fallback yields nothing for a
+            // shared or per-aggregate command handler. Resolve it here; the shell still
+            // derives `comp` itself from the spec name.
+            let pluginFragment = Util_LogAttribution.pluginFragment(
+              ~comp=`AggregateRuntime(${spec.aggregateName})`,
+            )
             let cmdGenHandlerConfigOutput =
               Pulumi.Output.all3((info.eventLogTableName, spec.queueUrl, spec.queueArn))
               ->Pulumi.Output.apply(((table, queueUrl, queueArn)) =>
-                `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"}]}`
+                `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"${pluginFragment}}]}`
               )
 
             let cmdGenEnvVars: dict<Pulumi.Input.t<string>> = Dict.make()
@@ -256,6 +271,7 @@ let finish = () =>
             let cmdGenRuntime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
               ~name=cmdGenName,
               ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+              ~componentKind=ReventlessCore.ComponentType.Aggregate,
               ~code=cmdGenCode,
               ~sourceCodeHash=cmdGenSourceCodeHash,
               ~envVars=cmdGenEnvVars,
@@ -301,6 +317,7 @@ let finish = () =>
             let evtMapperRuntime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
               ~name=evtMapperName,
               ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+              ~componentKind=ReventlessCore.ComponentType.Aggregate,
               ~code=evtMapperCode,
               ~sourceCodeHash=evtMapperSourceCodeHash,
               ~envVars=evtMapperEnvVars,

package/src/adapter/Runtime/AggregateRuntime_Builder_Micro_Async.res.mjs

@@ -8,6 +8,7 @@ import * as Aggregate$ReventlessCore from "@reventlessdev/reventless-core/src/co
 import * as Component$ReventlessCore from "@reventlessdev/reventless-core/src/components/Component.res.mjs";
 import * as Util_Bundle$ReventlessAws from "../../util/Util_Bundle.res.mjs";
 import * as ComponentType$ReventlessCore from "@reventlessdev/reventless-core/src/ComponentType.res.mjs";
+import * as Util_LogAttribution$ReventlessAws from "../../util/Util_LogAttribution.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "./RuntimeEnvironment_Lambda.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 
@@ -164,29 +165,31 @@ function finish() {
       packageDirs[behaviorPkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(behaviorPkg);
       let specModule = Stdlib_Option.getOr(JSON.stringify(info.specModulePath), `""`);
       let behaviorModule = Stdlib_Option.getOr(JSON.stringify(info.behaviorModulePath), `""`);
+      let pluginFragment = Util_LogAttribution$ReventlessAws.pluginFragment(`AggregateRuntime(` + spec.aggregateName + `)`);
       let cmdTopicHandlerConfigOutput = Pulumi.all([
         info.eventLogTableName,
         spec.queueUrl,
         spec.queueArn
-      ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"}]}`);
+      ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"` + pluginFragment + `}]}`);
       let cmdTopicEnvVars = {};
       cmdTopicEnvVars["HANDLER_CONFIG"] = cmdTopicHandlerConfigOutput;
       let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/AggregateEntryPoint.mjs", packageDirs, undefined);
       let cmdTopicName = baseName + "CmdHandler";
-      let cmdTopicRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdTopicName, "CommandHandler", match.code, match.sourceCodeHash, cmdTopicEnvVars, Math.max(spec.commandTopicMemorySize, 1024), Math.max(spec.commandTopicTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
+      let cmdTopicRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdTopicName, "CommandHandler", "Aggregate", match.code, match.sourceCodeHash, cmdTopicEnvVars, Math.max(spec.commandTopicMemorySize, 1024), Math.max(spec.commandTopicTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
       spec.commandTopicConnects.forEach(connect => connect(cmdTopicRuntime));
       if (spec.commandGeneratorConnects.length !== 0) {
+        let pluginFragment$1 = Util_LogAttribution$ReventlessAws.pluginFragment(`AggregateRuntime(` + spec.aggregateName + `)`);
         let cmdGenHandlerConfigOutput = Pulumi.all([
           info.eventLogTableName,
           spec.queueUrl,
           spec.queueArn
-        ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"}]}`);
+        ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"` + pluginFragment$1 + `}]}`);
         let cmdGenEnvVars = {};
         cmdGenEnvVars["HANDLER_CONFIG"] = cmdGenHandlerConfigOutput;
         cmdGenEnvVars["DISPATCH_MODE"] = "async";
         let match$1 = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/AggregateEntryPoint.mjs", packageDirs, undefined);
         let cmdGenName = baseName + "CmdGen";
-        let cmdGenRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdGenName, "CommandHandler", match$1.code, match$1.sourceCodeHash, cmdGenEnvVars, Math.max(spec.commandGeneratorMemorySize, 1024), Math.max(spec.commandGeneratorTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
+        let cmdGenRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(cmdGenName, "CommandHandler", "Aggregate", match$1.code, match$1.sourceCodeHash, cmdGenEnvVars, Math.max(spec.commandGeneratorMemorySize, 1024), Math.max(spec.commandGeneratorTimeout, 30), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
         spec.commandGeneratorConnects.forEach(connect => connect(cmdGenRuntime));
       }
       let match$2 = spec.eventCollectorChannelSpec;
@@ -209,7 +212,7 @@ function finish() {
       evtMapperPackageDirs[mappingsPkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(mappingsPkg);
       let match$4 = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/EventMapperEntryPoint.mjs", evtMapperPackageDirs, undefined);
       let evtMapperName = baseName + "EventMapper";
-      let evtMapperRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(evtMapperName, "CommandHandler", match$4.code, match$4.sourceCodeHash, evtMapperEnvVars, Math.max(spec.eventCollectorMemorySize, 2048), Math.max(spec.eventCollectorTimeout, 180), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
+      let evtMapperRuntime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(evtMapperName, "CommandHandler", "Aggregate", match$4.code, match$4.sourceCodeHash, evtMapperEnvVars, Math.max(spec.eventCollectorMemorySize, 2048), Math.max(spec.eventCollectorTimeout, 180), undefined, undefined, undefined, undefined, undefined, aggregateOpts);
       EventCollectorChannel_DynamoDbStream$ReventlessAws.connect(evtMapperName, [match$2], evtMapperRuntime, aggregateOpts);
     });
   }

package/src/adapter/Runtime/AggregateRuntime_Builder_PerAggregate.res

@@ -193,10 +193,17 @@ let finish = () =>
           let behaviorModule =
             info.behaviorModulePath->JSON.stringifyAny->Option.getOr(`""`)
 
+// `plugin` cannot be resolved inside the Lambda — LogPrefix's registry is a
+          // deploy-time structure, and the Lambda-name fallback yields nothing for a
+          // shared or per-aggregate command handler. Resolve it here; the shell still
+          // derives `comp` itself from the spec name.
+          let pluginFragment = Util_LogAttribution.pluginFragment(
+            ~comp=`AggregateRuntime(${spec.aggregateName})`,
+          )
           let handlerConfigOutput =
             Pulumi.Output.all3((info.eventLogTableName, spec.queueUrl, spec.queueArn))
             ->Pulumi.Output.apply(((table, queueUrl, queueArn)) =>
-              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"}]}`
+              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"${pluginFragment}}]}`
             )
 
           let envVars: dict<Pulumi.Input.t<string>> = Dict.make()
@@ -218,6 +225,7 @@ let finish = () =>
           let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
             ~name=lambdaName,
             ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+            ~componentKind=ReventlessCore.ComponentType.Aggregate,
             ~code,
             ~sourceCodeHash,
             ~envVars,

package/src/adapter/Runtime/AggregateRuntime_Builder_PerAggregate.res.mjs

@@ -8,6 +8,7 @@ import * as Aggregate$ReventlessCore from "@reventlessdev/reventless-core/src/co
 import * as Component$ReventlessCore from "@reventlessdev/reventless-core/src/components/Component.res.mjs";
 import * as Util_Bundle$ReventlessAws from "../../util/Util_Bundle.res.mjs";
 import * as ComponentType$ReventlessCore from "@reventlessdev/reventless-core/src/ComponentType.res.mjs";
+import * as Util_LogAttribution$ReventlessAws from "../../util/Util_LogAttribution.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "./RuntimeEnvironment_Lambda.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 
@@ -139,11 +140,12 @@ function finish() {
       let lambdaName = name + "CmdHandler";
       let specModule = Stdlib_Option.getOr(JSON.stringify(info.specModulePath), `""`);
       let behaviorModule = Stdlib_Option.getOr(JSON.stringify(info.behaviorModulePath), `""`);
+      let pluginFragment = Util_LogAttribution$ReventlessAws.pluginFragment(`AggregateRuntime(` + spec.aggregateName + `)`);
       let handlerConfigOutput = Pulumi.all([
         info.eventLogTableName,
         spec.queueUrl,
         spec.queueArn
-      ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"}]}`);
+      ]).apply(param => `{"handlers":[{"specModule":` + specModule + `,"behaviorModule":` + behaviorModule + `,"eventLogTable":"` + param[0] + `","queueUrl":"` + param[1] + `","queueArn":"` + param[2] + `"` + pluginFragment + `}]}`);
       let envVars = {};
       envVars["HANDLER_CONFIG"] = handlerConfigOutput;
       let packageDirs = {};
@@ -152,7 +154,7 @@ function finish() {
       packageDirs[specPkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(specPkg);
       packageDirs[behaviorPkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(behaviorPkg);
       let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/AggregateEntryPoint.mjs", packageDirs, undefined);
-      let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(lambdaName, "CommandHandler", match.code, match.sourceCodeHash, envVars, spec.memorySize, spec.timeout, undefined, undefined, undefined, undefined, undefined, aggregateOpts);
+      let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(lambdaName, "CommandHandler", "Aggregate", match.code, match.sourceCodeHash, envVars, spec.memorySize, spec.timeout, undefined, undefined, undefined, undefined, undefined, aggregateOpts);
       spec.connects.forEach(connect => connect(runtime));
       let channelSpecs = Stdlib_Option.mapOr(spec.eventCollectorChannelSpec, [], cs => [cs]);
       EventCollectorChannel_DynamoDbStream$ReventlessAws.connect(name, channelSpecs, runtime, aggregateOpts);

package/src/adapter/Runtime/AggregateRuntime_Builder_PerAggregate_Async.res

@@ -191,10 +191,17 @@ let finish = () =>
           let behaviorModule =
             info.behaviorModulePath->JSON.stringifyAny->Option.getOr(`""`)
 
+// `plugin` cannot be resolved inside the Lambda — LogPrefix's registry is a
+          // deploy-time structure, and the Lambda-name fallback yields nothing for a
+          // shared or per-aggregate command handler. Resolve it here; the shell still
+          // derives `comp` itself from the spec name.
+          let pluginFragment = Util_LogAttribution.pluginFragment(
+            ~comp=`AggregateRuntime(${spec.aggregateName})`,
+          )
           let handlerConfigOutput =
             Pulumi.Output.all3((info.eventLogTableName, spec.queueUrl, spec.queueArn))
             ->Pulumi.Output.apply(((table, queueUrl, queueArn)) =>
-              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"}]}`
+              `{"handlers":[{"specModule":${specModule},"behaviorModule":${behaviorModule},"eventLogTable":"${table}","queueUrl":"${queueUrl}","queueArn":"${queueArn}"${pluginFragment}}]}`
             )
 
           let envVars: dict<Pulumi.Input.t<string>> = Dict.make()
@@ -215,6 +222,7 @@ let finish = () =>
           let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
             ~name,
             ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+            ~componentKind=ReventlessCore.ComponentType.Aggregate,
             ~code,
             ~sourceCodeHash,
             ~envVars,