@reventlessdev/reventless-core 3.0.0-alpha.146 → 3.0.0-alpha.148

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.0.0-alpha.148 (2026-07-09)
+
+### Bug Fixes
+
+* **reventless-core:** DCB StateChangeSlices expose one mutation per command constructor ([136fe93](https://github.com/ReventlessDev/reventless-core/commit/136fe93c56c2e5115eb60d792e9d5e9c07eecc2b))
+
+
+# 3.0.0-alpha.147 (2026-07-08)
+
+### Bug Fixes
+
+* **reventless-core:** composite DCB slices can read back their own events ([4604a91](https://github.com/ReventlessDev/reventless-core/commit/4604a9159fb8bf59b2191ad69fee6613c7f75cd9))
+
+
 # 3.0.0-alpha.146 (2026-07-08)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-core",
-  "version": "3.0.0-alpha.146",
+  "version": "3.0.0-alpha.148",
   "description": "Core package for Reventless framework",
   "license": "Apache-2.0",
   "jest": {
@@ -28,17 +28,17 @@
   "dependencies": {
     "sury": "11.0.0-alpha.4",
     "uuid": "^13.0.0",
+    "@reventlessdev/rescript-effect": "0.1.0-alpha.25",
     "@reventlessdev/rescript-hash-object": "1.2.0-alpha.10",
     "@reventlessdev/rescript-fast-csv": "1.2.0-alpha.11",
-    "@reventlessdev/rescript-effect": "0.1.0-alpha.25",
     "@reventlessdev/rescript-jest": "1.0.0-alpha.6",
     "@reventlessdev/rescript-node-streams": "1.1.0-alpha.10",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.14",
     "@reventlessdev/rescript-uuid": "1.1.0-alpha.14",
     "@reventlessdev/reventless-infra": "3.0.0-alpha.91",
     "@reventlessdev/reventless-interop": "3.0.0-alpha.24",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.69",
-    "@reventlessdev/rescript-ssh2": "1.1.0-alpha.11"
+    "@reventlessdev/rescript-ssh2": "1.1.0-alpha.11",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.69"
   },
   "devDependencies": {
     "rescript": "^12.3.0",

package/src/components/Api/Api_Naming.res

@@ -1,3 +1,5 @@
+open ReventlessInfra.Api
+
 type queryNames = {
   singleFieldName: string,
   listFieldName: string,
@@ -39,6 +41,46 @@ let aggregateMutationField = (~plugin: string, ~aggregate: string, ~command: str
 
 let sliceMutationField = (~plugin: string, ~slice: string) => `${plugin}_${slice}`
 
+// DCB StateChangeSlice mutation fields — one per API-exposed command constructor,
+// mirroring the aggregate path (which emits one field per constructor). A slice whose
+// command union has a single API-exposed constructor keeps the byte-identical
+// `Plugin_Slice` name (no schema churn); a multi-command slice uses aggregate-style
+// `Plugin_Slice_Ctor` per constructor so the SDL generator and command resolvers
+// derive the constructor from the trailing `_` segment. @noApi variants are filtered
+// out. Returns [(fieldName, constructorName)] in declaration order.
+let sliceMutationFields = (
+  ~plugin: string,
+  ~slice: string,
+  ~commandSchema: S.t<unknown>,
+): array<(string, string)> => {
+  let allNames = Reventless.DcbTag.extractAllVariantNames(commandSchema->Obj.magic)
+  let filtered = ApiNoApiHelpers.filterNoApiVariants(allNames, commandSchema)
+  switch filtered {
+  | [] => []
+  | [single] => [(sliceMutationField(~plugin, ~slice), single)]
+  | _ =>
+    filtered->Array.map(ctor => (
+      aggregateMutationField(~plugin, ~aggregate=slice, ~command=ctor),
+      ctor,
+    ))
+  }
+}
+
+// The mutation field name for a single command constructor of a DCB StateChangeSlice,
+// consistent with `sliceMutationFields`: single-command slices resolve every variant
+// to the slice name, multi-command slices to the aggregate-style per-constructor name.
+let sliceMutationFieldFor = (
+  ~plugin: string,
+  ~slice: string,
+  ~commandSchema: S.t<unknown>,
+  ~variant: string,
+): string =>
+  if sliceMutationFields(~plugin, ~slice, ~commandSchema)->Array.length <= 1 {
+    sliceMutationField(~plugin, ~slice)
+  } else {
+    aggregateMutationField(~plugin, ~aggregate=slice, ~command=variant)
+  }
+
 // Pluralize via the singular stem so already-plural names normalise correctly:
 // "Orders" → "Order" → "Orders" (was "Orderses"); "Categories" → "Category" →
 // "Categories" (was "Categorieses"). For singular entity names like

package/src/components/Api/Api_Naming.res.mjs

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
+import * as ApiNoApiHelpers$ReventlessCore from "./ApiNoApiHelpers.res.mjs";
 
 function pluralize(n) {
   if (/[^aeiou]y$/i.test(n)) {
@@ -39,6 +41,35 @@ function sliceMutationField(plugin, slice) {
   return plugin + `_` + slice;
 }
 
+function sliceMutationFields(plugin, slice, commandSchema) {
+  let allNames = DcbTag$Reventless.extractAllVariantNames(commandSchema);
+  let filtered = ApiNoApiHelpers$ReventlessCore.filterNoApiVariants(allNames, commandSchema);
+  let len = filtered.length;
+  if (len !== 1) {
+    if (len !== 0) {
+      return filtered.map(ctor => [
+        aggregateMutationField(plugin, slice, ctor),
+        ctor
+      ]);
+    } else {
+      return [];
+    }
+  }
+  let single = filtered[0];
+  return [[
+      sliceMutationField(plugin, slice),
+      single
+    ]];
+}
+
+function sliceMutationFieldFor(plugin, slice, commandSchema, variant) {
+  if (sliceMutationFields(plugin, slice, commandSchema).length <= 1) {
+    return sliceMutationField(plugin, slice);
+  } else {
+    return aggregateMutationField(plugin, slice, variant);
+  }
+}
+
 function canonicalPlural(n) {
   return pluralize(singularize(n));
 }
@@ -94,10 +125,12 @@ export {
   stripViewSuffix,
   aggregateMutationField,
   sliceMutationField,
+  sliceMutationFields,
+  sliceMutationFieldFor,
   canonicalPlural,
   queryFieldNamesForReadModel,
   queryFieldNamesForStateView,
   queryFieldNamesForSliceQueryDb,
   adminField,
 }
-/* No side effect */
+/* DcbTag-Reventless Not a pure module */

package/src/components/Dcb/Dcb_Builder.res

@@ -410,7 +410,11 @@ module Make = (
             if !(ApiNoApiHelpers.isNoApi(commandSchema)) {
               registerResolver(
                 ~kind=Dcb,
-                ~fields=[Api_Naming.sliceMutationField(~plugin=name, ~slice=S.Spec.name)],
+                ~fields=Api_Naming.sliceMutationFields(
+                  ~plugin=name,
+                  ~slice=S.Spec.name,
+                  ~commandSchema,
+                )->Array.map(((f, _)) => f),
                 ~commandSchema,
                 ~commandAuthorization=S.Spec.commandAuthorization->Obj.magic,
               )
@@ -423,7 +427,11 @@ module Make = (
             if !(ApiNoApiHelpers.isNoApi(commandSchema)) {
               registerResolver(
                 ~kind=Dcb,
-                ~fields=[Api_Naming.sliceMutationField(~plugin=name, ~slice=S.Spec.name)],
+                ~fields=Api_Naming.sliceMutationFields(
+                  ~plugin=name,
+                  ~slice=S.Spec.name,
+                  ~commandSchema,
+                )->Array.map(((f, _)) => f),
                 ~commandSchema,
                 ~commandAuthorization=S.Spec.commandAuthorization->Obj.magic,
               )
@@ -446,7 +454,8 @@ module Make = (
               ) => {
                 let commandSchema = S.Spec.commandSchema->Reventless.DcbTag.toUnknownSchema
                 if !(ApiNoApiHelpers.isNoApi(commandSchema)) {
-                  let fieldName = Api_Naming.sliceMutationField(~plugin=name, ~slice=S.Spec.name)
+                  // One generateCommand backs every constructor's field — the TAG is
+                  // injected by the resolver per field, so a single binding suffices.
                   let generateCommand = CommandGenerator_Callback.makeGenerateCommand(
                     ~publishJsons=ops.publishJsons,
                     ~publishJsonsAndWait=?ops.publishJsonsAndWait,
@@ -455,7 +464,8 @@ module Make = (
                     ~componentKind=CommandGenerator_Callback.StateChangeSlice,
                     ~stripIdFromParams=false,
                   )
-                  bindHandler(~field=fieldName, ~generateCommand)
+                  Api_Naming.sliceMutationFields(~plugin=name, ~slice=S.Spec.name, ~commandSchema)
+                  ->Array.forEach(((fieldName, _)) => bindHandler(~field=fieldName, ~generateCommand))
                 }
               })
             })
@@ -471,7 +481,8 @@ module Make = (
                 ) => {
                   let commandSchema = S.Spec.commandSchema->Reventless.DcbTag.toUnknownSchema
                   if !(ApiNoApiHelpers.isNoApi(commandSchema)) {
-                    let fieldName = Api_Naming.sliceMutationField(~plugin=name, ~slice=S.Spec.name)
+                    // One generateCommand backs every constructor's field — the TAG is
+                    // injected by the resolver per field, so a single binding suffices.
                     let generateCommand = CommandGenerator_Callback.makeGenerateCommand(
                       ~publishJsons=asyncOps.publishJsons,
                       ~publishJsonsAndWait=?asyncOps.publishJsonsAndWait,
@@ -480,7 +491,8 @@ module Make = (
                       ~componentKind=CommandGenerator_Callback.StateChangeSlice,
                       ~stripIdFromParams=false,
                     )
-                    bindHandler(~field=fieldName, ~generateCommand)
+                    Api_Naming.sliceMutationFields(~plugin=name, ~slice=S.Spec.name, ~commandSchema)
+                    ->Array.forEach(((fieldName, _)) => bindHandler(~field=fieldName, ~generateCommand))
                   }
                 })
               })
@@ -706,19 +718,19 @@ module Make = (
 
         // Collect DCB mutation field names + TAGs for AppSync resolver creation
         // (excludes @noApi slices — includes both sync and async)
+        // One (fieldName, TAG) pair per API-exposed command constructor. The AWS
+        // resolver layer (CommandGeneratorResolvers_AppSync.makeDcb) zips these into
+        // one resolver per field, each injecting its own constructor TAG into the
+        // Lambda payload — so a multi-command slice's every command is dispatchable.
         let dcbMutationData =
-          stateChangeSlices->Array.filterMap((
+          stateChangeSlices->Array.flatMap((
             module(S: StateChangeSlice.T),
           ) => {
             let commandSchema = S.Spec.commandSchema->Reventless.DcbTag.toUnknownSchema
             if ApiNoApiHelpers.isNoApi(commandSchema) {
-              None
+              []
             } else {
-              let fieldName = Api_Naming.sliceMutationField(~plugin=name, ~slice=S.Spec.name)
-              let constructorNames =
-                Reventless.DcbTag.extractAllVariantNames(S.Spec.commandSchema->Obj.magic)
-              let tag = constructorNames->Array.get(0)->Option.getOr(S.Spec.name)
-              Some((fieldName, tag))
+              Api_Naming.sliceMutationFields(~plugin=name, ~slice=S.Spec.name, ~commandSchema)
             }
           })
         let dcbFieldNames = dcbMutationData->Array.map(((f, _)) => f)
@@ -812,24 +824,29 @@ module Make = (
             module(S: StateChangeSlice.T),
           ) => {
             let commandSchema = S.Spec.commandSchema->Reventless.DcbTag.toUnknownSchema
-            if ApiNoApiHelpers.isNoApi(commandSchema) {
+            let fieldSpecs =
+              Api_Naming.sliceMutationFields(~plugin=name, ~slice=S.Spec.name, ~commandSchema)
+            if ApiNoApiHelpers.isNoApi(commandSchema) || fieldSpecs->Array.length == 0 {
               None
             } else {
               let sliceDef =
                 pluginStructure->Option.flatMap(s =>
                   s.stateChangeSlices->Array.find(d => d.name == S.Spec.name)
                 )
-              let fieldName = Api_Naming.sliceMutationField(~plugin=name, ~slice=S.Spec.name)
+              // One SDL field per constructor, each with its own constructor's args and
+              // its own per-constructor authorization rule.
+              let commandAuthorization: unknown => Reventless.Authorization.permission =
+                S.Spec.commandAuthorization->Obj.magic
               let fieldPermissions = Dict.make()
-              switch permissionForFirstConstructor(
-                ~commandSchema,
-                ~commandAuthorization=S.Spec.commandAuthorization->Obj.magic,
-              ) {
-              | Some(rule) => fieldPermissions->Dict.set(fieldName, rule)
-              | None => ()
-              }
+              fieldSpecs->Array.forEach(((fieldName, ctor)) => {
+                let hasPayload =
+                  Reventless.DcbTag.isVariantPayloadBearing(commandSchema->Obj.magic, ctor)
+                let syntheticCmd: unknown =
+                  hasPayload ? {"TAG": ctor}->Obj.magic : ctor->Obj.magic
+                fieldPermissions->Dict.set(fieldName, commandAuthorization(syntheticCmd))
+              })
               Some({
-                ReventlessInfra.Api.fieldNames: [fieldName],
+                ReventlessInfra.Api.fieldNames: fieldSpecs->Array.map(((f, _)) => f),
                 commandSchema,
                 fieldPermissions,
                 systemCallable: systemCallableComponents->Array.includes(S.Spec.name),

package/src/components/Dcb/Dcb_Builder.res.mjs

@@ -225,13 +225,13 @@ function Make(DcbEventLogStorage) {
         syncSlices.forEach(S => {
           let commandSchema = S.Spec.commandSchema;
           if (!ApiNoApiHelpers$ReventlessCore.isNoApi(commandSchema)) {
-            return registerResolver("Dcb", [Api_Naming$ReventlessCore.sliceMutationField(name, S.Spec.name)], commandSchema, S.Spec.commandAuthorization);
+            return registerResolver("Dcb", Api_Naming$ReventlessCore.sliceMutationFields(name, S.Spec.name, commandSchema).map(param => param[0]), commandSchema, S.Spec.commandAuthorization);
           }
         });
         asyncSlices.forEach(S => {
           let commandSchema = S.Spec.commandSchema;
           if (!ApiNoApiHelpers$ReventlessCore.isNoApi(commandSchema)) {
-            return registerResolver("Dcb", [Api_Naming$ReventlessCore.sliceMutationField(name, S.Spec.name)], commandSchema, S.Spec.commandAuthorization);
+            return registerResolver("Dcb", Api_Naming$ReventlessCore.sliceMutationFields(name, S.Spec.name, commandSchema).map(param => param[0]), commandSchema, S.Spec.commandAuthorization);
           }
         });
       }
@@ -243,9 +243,8 @@ function Make(DcbEventLogStorage) {
             if (ApiNoApiHelpers$ReventlessCore.isNoApi(commandSchema)) {
               return;
             }
-            let fieldName = Api_Naming$ReventlessCore.sliceMutationField(name, S.Spec.name);
             let generateCommand = CommandGenerator_Callback$ReventlessCore.makeGenerateCommand(ops.publishJsons, ops.publishJsonsAndWait, S.Spec.name, S.Spec.commandSchema, "StateChangeSlice", false);
-            bindHandler(fieldName, generateCommand);
+            Api_Naming$ReventlessCore.sliceMutationFields(name, S.Spec.name, commandSchema).forEach(param => bindHandler(param[0], generateCommand));
           });
         });
         if (asyncDcbCommandTopicOpt !== undefined) {
@@ -255,9 +254,8 @@ function Make(DcbEventLogStorage) {
               if (ApiNoApiHelpers$ReventlessCore.isNoApi(commandSchema)) {
                 return;
               }
-              let fieldName = Api_Naming$ReventlessCore.sliceMutationField(name, S.Spec.name);
               let generateCommand = CommandGenerator_Callback$ReventlessCore.makeGenerateCommand(asyncOps.publishJsons, asyncOps.publishJsonsAndWait, S.Spec.name, S.Spec.commandSchema, "StateChangeSlice", false);
-              bindHandler(fieldName, generateCommand);
+              Api_Naming$ReventlessCore.sliceMutationFields(name, S.Spec.name, commandSchema).forEach(param => bindHandler(param[0], generateCommand));
             });
           });
         }
@@ -394,18 +392,13 @@ function Make(DcbEventLogStorage) {
       let asyncDcbResources = Object.values(asyncStateChangeSlicesOutputs).flatMap(outputs => outputs.resources);
       let inboundFieldNames = inboundTranslationSliceData.map(param => param[1]);
       let inboundSchemas = inboundTranslationSliceData.map(param => param[3]);
-      let dcbMutationData = Stdlib_Array.filterMap(stateChangeSlices, S => {
+      let dcbMutationData = stateChangeSlices.flatMap(S => {
         let commandSchema = S.Spec.commandSchema;
         if (ApiNoApiHelpers$ReventlessCore.isNoApi(commandSchema)) {
-          return;
+          return [];
+        } else {
+          return Api_Naming$ReventlessCore.sliceMutationFields(name, S.Spec.name, commandSchema);
         }
-        let fieldName = Api_Naming$ReventlessCore.sliceMutationField(name, S.Spec.name);
-        let constructorNames = DcbTag$Reventless.extractAllVariantNames(S.Spec.commandSchema);
-        let tag = Stdlib_Option.getOr(constructorNames[0], S.Spec.name);
-        return [
-          fieldName,
-          tag
-        ];
       });
       let dcbFieldNames = dcbMutationData.map(param => param[0]);
       let dcbTags = dcbMutationData.map(param => param[1]);
@@ -458,18 +451,23 @@ function Make(DcbEventLogStorage) {
       };
       let mutationEntriesFromSlices = Stdlib_Array.filterMap(stateChangeSlices, S => {
         let commandSchema = S.Spec.commandSchema;
-        if (ApiNoApiHelpers$ReventlessCore.isNoApi(commandSchema)) {
+        let fieldSpecs = Api_Naming$ReventlessCore.sliceMutationFields(name, S.Spec.name, commandSchema);
+        if (ApiNoApiHelpers$ReventlessCore.isNoApi(commandSchema) || fieldSpecs.length === 0) {
           return;
         }
         let sliceDef = Stdlib_Option.flatMap(pluginStructure, s => s.stateChangeSlices.find(d => d.name === S.Spec.name));
-        let fieldName = Api_Naming$ReventlessCore.sliceMutationField(name, S.Spec.name);
+        let commandAuthorization = S.Spec.commandAuthorization;
         let fieldPermissions = {};
-        let rule = permissionForFirstConstructor(commandSchema, S.Spec.commandAuthorization);
-        if (rule !== undefined) {
-          fieldPermissions[fieldName] = rule;
-        }
+        fieldSpecs.forEach(param => {
+          let ctor = param[1];
+          let hasPayload = DcbTag$Reventless.isVariantPayloadBearing(commandSchema, ctor);
+          let syntheticCmd = hasPayload ? ({
+              TAG: ctor
+            }) : ctor;
+          fieldPermissions[param[0]] = commandAuthorization(syntheticCmd);
+        });
         return {
-          fieldNames: [fieldName],
+          fieldNames: fieldSpecs.map(param => param[0]),
           commandSchema: commandSchema,
           fieldPermissions: fieldPermissions,
           systemCallable: systemCallableComponents.includes(S.Spec.name),

package/src/components/StateChangeSlice/StateChangeSlice_Callback.res

@@ -61,8 +61,7 @@ module Make = (
     | Some(keys) => baseTags->Array.filter(t => keys->Array.includes(t.key))
     | None => baseTags
     }
-    let tags =
-      indexedTags->Array.concat([{Reventless.DcbTag.key: "originatorSlice", value: Spec.name}])
+    let tags = indexedTags
     // Inherit service from the triggering command — the DcbEventLog publish path
     // overrides service to `<name>DcbEventLog` for routing so EventCollector
     // subscriptions still match.
@@ -83,12 +82,8 @@ module Make = (
   // tag value(s) instead of logging no id.
   let readEventId = (tags: array<Reventless.DcbTag.tag>): option<string> => {
     let ownTagValues = () => {
-      // Skip the `originatorSlice` metadata tag that `encodeEvent` appends to
-      // every stored event — it's the producing slice's name, not an entity id.
       let vals =
-        tags
-        ->Array.filter((t: Reventless.DcbTag.tag) => t.key != "originatorSlice")
-        ->Array.reduce([], (acc, t: Reventless.DcbTag.tag) =>
+        tags->Array.reduce([], (acc, t: Reventless.DcbTag.tag) =>
           acc->Array.includes(t.value) ? acc : acc->Array.concat([t.value])
         )
       vals->Array.length == 0 ? None : Some(vals->Array.join(","))

package/src/components/StateChangeSlice/StateChangeSlice_Callback.res.mjs

@@ -29,7 +29,7 @@ function Make(Spec) {
       ]]);
     let readEventId = tags => {
       let ownTagValues = () => {
-        let vals = Stdlib_Array.reduce(tags.filter(t => t.key !== "originatorSlice"), [], (acc, t) => {
+        let vals = Stdlib_Array.reduce(tags, [], (acc, t) => {
           if (acc.includes(t.value)) {
             return acc;
           } else {
@@ -188,15 +188,11 @@ function Make(Spec) {
                 let baseTags = DcbTag$Reventless.extractTagsExpanded(Spec.eventSchema, e);
                 let keys = tagKeysByEventType[eventType];
                 let indexedTags = keys !== undefined ? baseTags.filter(t => keys.includes(t.key)) : baseTags;
-                let tags = indexedTags.concat([{
-                    key: "originatorSlice",
-                    value: Spec.name
-                  }]);
                 let meta = Message$ReventlessCore.deriveMeta(parentMeta, undefined);
                 return {
                   eventType: eventType,
                   data: match[1],
-                  tags: tags,
+                  tags: indexedTags,
                   meta: meta
                 };
               });

package/src/plugin/component/Plugin_Structure.res

@@ -440,7 +440,13 @@ let make = (
         Reventless.Plugin.name: SCS.Spec.name,
         commands: extractCommandDefs(
           ~isAggregate=false,
-          ~mutationFieldFor=_variantName => Api_Naming.sliceMutationField(~plugin=name, ~slice=SCS.Spec.name),
+          ~mutationFieldFor=variantName =>
+            Api_Naming.sliceMutationFieldFor(
+              ~plugin=name,
+              ~slice=SCS.Spec.name,
+              ~commandSchema=SCS.Spec.commandSchema->S.castToUnknown,
+              ~variant=variantName,
+            ),
           SCS.Spec.commandSchema->S.castToUnknown,
         ),
         producedEventTypes: produced,

package/src/plugin/component/Plugin_Structure.res.mjs

@@ -361,7 +361,7 @@ function make(name, aggregatesOpt, readModelsOpt, stateViewSlicesOpt, stateChang
     let consumed = match$1[1];
     return {
       name: SCS.Spec.name,
-      commands: extractCommandDefs(false, _variantName => Api_Naming$ReventlessCore.sliceMutationField(name, SCS.Spec.name), SCS.Spec.commandSchema),
+      commands: extractCommandDefs(false, variantName => Api_Naming$ReventlessCore.sliceMutationFieldFor(name, SCS.Spec.name, SCS.Spec.commandSchema, variantName), SCS.Spec.commandSchema),
       producedEventTypes: produced,
       consumedEventTypes: consumed,
       linkedViews: linkedSvsFor(produced),

package/src/plugin/component/Plugin_SubscriptionSchema.res

@@ -61,8 +61,7 @@ let sourceCFields = (
 // Pushed via AppSync Events API. Admin / observability only.
 //
 // Returns (subscriptionFields, supportingTypes) — the supporting type is the
-// {DisplayName}EventLogEvent type that carries position, eventType, payload, and
-// the optional originatorSlice tag injected by StateChangeSlice_Callback.
+// {DisplayName}EventLogEvent type that carries position, eventType, and payload.
 
 let sourceAFieldsAndTypes = (
   ~eventLogEntries: array<eventLogSchemaEntry>,
@@ -76,7 +75,7 @@ let sourceAFieldsAndTypes = (
       seen->Set.add(n)
       fields->Array.push(`  on${n}EventLog_eventAppended: ${n}EventLogEvent`)
       types->Array.push(
-        `type ${n}EventLogEvent {\n  position: String!\n  eventType: String!\n  payload: AWSJSON!\n  originatorSlice: String\n}`,
+        `type ${n}EventLogEvent {\n  position: String!\n  eventType: String!\n  payload: AWSJSON!\n}`,
       )
     }
   })

package/src/plugin/component/Plugin_SubscriptionSchema.res.mjs

@@ -41,7 +41,7 @@ function sourceAFieldsAndTypes(eventLogEntries) {
     if (!seen.has(n)) {
       seen.add(n);
       fields.push(`  on` + n + `EventLog_eventAppended: ` + n + `EventLogEvent`);
-      types.push(`type ` + n + `EventLogEvent {\n  position: String!\n  eventType: String!\n  payload: AWSJSON!\n  originatorSlice: String\n}`);
+      types.push(`type ` + n + `EventLogEvent {\n  position: String!\n  eventType: String!\n  payload: AWSJSON!\n}`);
       return;
     }
   });

package/tests/dcb/DcbStateChangeSliceTest.res

@@ -81,7 +81,7 @@ describe("StateChangeSlice_Callback:", () => {
       ))->toEqual(([Ok("ref-1")], 1, 1))
     })
 
-    testPromise("stored event has correct tags", async () => {
+    testPromise("stored event carries only its entity tags (no framework provenance tag)", async () => {
       let _ = await TestHandler.handleCommands(
         testDcbEventLog,
         Stream.fromIterable([
@@ -90,10 +90,11 @@ describe("StateChangeSlice_Callback:", () => {
       )->Effect.runPromise
       let storedEvent = mock.getEvents()->Array.getUnsafe(0)
 
-      expect(storedEvent.tags)->toEqual([
-        {Reventless.DcbTag.key: "itemId", value: "item-1"},
-        {Reventless.DcbTag.key: "originatorSlice", value: "TestStateChangeSlice"},
-      ])
+      // No `originatorSlice` (or any other) metadata tag is smuggled into the tag
+      // set — a stored event's tags are exactly its DCB entity tags, so the
+      // composite read/write keys stay aligned. See
+      // docs/analysis/dcb-event-provenance-and-metadata.md.
+      expect(storedEvent.tags)->toEqual([{Reventless.DcbTag.key: "itemId", value: "item-1"}])
     })
   })
 

package/tests/dcb/DcbStateChangeSliceTest.res.mjs

@@ -201,23 +201,17 @@ globalThis.describe("StateChangeSlice_Callback:", () => {
         1
       ]);
     });
-    globalThis.test("stored event has correct tags", async () => {
+    globalThis.test("stored event carries only its entity tags (no framework provenance tag)", async () => {
       await Effect.runPromise(TestHandler.handleCommands(undefined, undefined, testDcbEventLog, Stream.fromIterable([makeTopicItem("ref-1", {
           TAG: "CreateItem",
           itemId: "item-1",
           name: "Test"
         })])));
       let storedEvent = mock.getEvents()[0];
-      globalThis.expect(storedEvent.tags).toEqual([
-        {
+      globalThis.expect(storedEvent.tags).toEqual([{
           key: "itemId",
           value: "item-1"
-        },
-        {
-          key: "originatorSlice",
-          value: "TestStateChangeSlice"
-        }
-      ]);
+        }]);
     });
   });
   globalThis.describe("handleCommands - decide returns Ok([])", () => {