@reventlessdev/reventless-core 3.0.0-alpha.267 → 3.0.0-alpha.269

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 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.269 (2026-09-21)
+
+### Bug Fixes
+
+* **deps:** update rescript to 12.3.1 ([ea1ce37](https://github.com/ReventlessDev/reventless-core/commit/ea1ce377297640f6d0d360e6c84c778d59ecbcc5))
+* **deps:** update sury to 11.0.0 ([8715b22](https://github.com/ReventlessDev/reventless-core/commit/8715b22b33856c46ba57518aad151065c123a995))
+
+
+# 3.0.0-alpha.268 (2026-09-21)
+
+### Bug Fixes
+
+* **core:** a creating command's own id derives no reference ([58a921c](https://github.com/ReventlessDev/reventless-core/commit/58a921c84352f6522e7c175387927e32365aa94a))
+
+
 # 3.0.0-alpha.267 (2026-09-21)
 
 ### Bug Fixes

package/README.md

@@ -59,7 +59,7 @@ Then register it as a ReScript dependency in `rescript.json`:
 }
 ```
 
-Requires ReScript `^12.3.0` (peer dependency).
+Requires ReScript `^12.3.1` (peer dependency).
 
 ## Links
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-core",
-  "version": "3.0.0-alpha.267",
+  "version": "3.0.0-alpha.269",
   "description": "Core package for Reventless framework",
   "license": "Apache-2.0",
   "jest": {
@@ -26,27 +26,27 @@
     }
   },
   "dependencies": {
-    "sury": "11.0.0-rc.2",
+    "sury": "11.0.0",
     "uuid": "^13.0.0",
-    "@reventlessdev/rescript-effect": "0.1.0-alpha.33",
-    "@reventlessdev/rescript-fast-csv": "2.0.0-alpha.12",
-    "@reventlessdev/rescript-hash-object": "1.2.0-alpha.14",
-    "@reventlessdev/rescript-jest": "1.0.0-alpha.10",
-    "@reventlessdev/rescript-node": "2.0.0-alpha.12",
-    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.21",
-    "@reventlessdev/rescript-ssh2": "2.0.0-alpha.12",
-    "@reventlessdev/rescript-uuid": "2.0.0-alpha.0",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.168",
-    "@reventlessdev/reventless-interop": "3.0.0-alpha.37",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.140"
+    "@reventlessdev/rescript-effect": "0.1.0-alpha.34",
+    "@reventlessdev/rescript-hash-object": "1.2.0-alpha.15",
+    "@reventlessdev/rescript-fast-csv": "2.0.0-alpha.13",
+    "@reventlessdev/rescript-jest": "1.0.0-alpha.11",
+    "@reventlessdev/rescript-node": "2.0.0-alpha.13",
+    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.22",
+    "@reventlessdev/rescript-ssh2": "2.0.0-alpha.13",
+    "@reventlessdev/rescript-uuid": "2.0.0-alpha.1",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.169",
+    "@reventlessdev/reventless-interop": "3.0.0-alpha.38",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.141"
   },
   "devDependencies": {
-    "rescript": "12.3.0",
-    "sury-ppx": "11.0.0-rc.2",
+    "rescript": "12.3.1",
+    "sury-ppx": "11.0.0",
     "@reventlessdev/reventless-ppx": "1.0.0-alpha.81"
   },
   "peerDependencies": {
-    "rescript": "12.3.0"
+    "rescript": "^12.3.1"
   },
   "gitHead": "ddea51534dc210635d7b11968089627b3b697ce2",
   "publishConfig": {

package/src/components/AutomationSlice/AutomationSlice_Callback.res.mjs

@@ -28,8 +28,8 @@ let todoRowSchema = Sury.$schema(s => ({
   createdAt: s.m(Sury.string),
   processedAt: s.m(Sury.$option(Sury.string)),
   completedAt: s.m(Sury.$option(Sury.string)),
-  retryCount: s.m(Sury.int),
-  maxRetries: s.m(Sury.$option(Sury.int))
+  retryCount: s.m(Sury.int32),
+  maxRetries: s.m(Sury.$option(Sury.int32))
 }));
 
 function todoRowSchemaFor(itemSchema) {
@@ -39,8 +39,8 @@ function todoRowSchemaFor(itemSchema) {
     createdAt: s.m(Sury.string),
     processedAt: s.m(Sury.$option(Sury.string)),
     completedAt: s.m(Sury.$option(Sury.string)),
-    retryCount: s.m(Sury.int),
-    maxRetries: s.m(Sury.$option(Sury.int))
+    retryCount: s.m(Sury.int32),
+    maxRetries: s.m(Sury.$option(Sury.int32))
   }));
 }
 

package/src/components/CommandGenerator/CommandGenerator_Callback.res.mjs

@@ -59,103 +59,101 @@ function dropNullArguments(obj) {
   });
 }
 
-function makeGenerateCommand(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, $staropt$star, partitionTag) {
-  return payload => {
-    let stripIdFromParams = $staropt$star !== undefined ? $staropt$star : true;
-    return Effect.flatMap(Effect.tap(Effect.sync(() => {
-      let msgId = Message$ReventlessCore.uuid();
-      let meta_time = Message$ReventlessCore.nowAsISOString();
-      let meta_ip = Stdlib_Option.getOr(payload.meta.ip.shift(), "");
-      let meta_user = payload.meta.user;
-      let meta = {
-        service: serviceName,
-        time: meta_time,
-        ip: meta_ip,
-        user: meta_user,
-        msgId: msgId,
-        correlationId: msgId
-      };
-      let obj = Stdlib_Option.flatMap(JSON.stringify(payload.arguments), jsonString => Stdlib_JSON.Decode.object(JSON.parse(jsonString)));
-      let params = obj !== undefined ? (stripIdFromParams ? Stdlib_Dict.$$delete(obj, "id") : undefined, dropNullArguments(obj), stampOwnerFields(obj, commandSchema, payload.command, payload.identity, serviceName), Object.entries(obj)) : Stdlib_JsError.throwWithMessage("Couldn't decode:" + Stdlib_Option.getOr(JSON.stringify(payload.arguments), "<payload.arguments>"));
-      let commandStr = payload.command;
-      let match = params.length;
-      let commandJson = match !== 0 ? Object.fromEntries([[
-            "TAG",
-            commandStr
-          ]].concat(params)) : commandStr;
-      let suppliedId = payload.arguments.id;
-      let id;
-      id = componentKind === "Aggregate" || !(suppliedId == null) ? suppliedId : Stdlib_Option.mapOr(partitionTag, "", pt => DcbTag$Reventless.partitionValueOfTags(DcbTag$Reventless.extractTagsFromJson(commandSchema, commandJson), pt));
-      return [
-        meta,
-        commandJson,
-        id
-      ];
-    }), param => {
-      let commandJson = param[1];
-      return EffectLogger$ReventlessCore.logInfo(`CommandGenerator(` + serviceName + `)`, commandJson, `generated command: ` + LogFormat$ReventlessCore.cmdLabelOfJson(commandJson));
-    }), param => {
-      let id = param[2];
-      let commandJson = param[1];
-      let meta = param[0];
-      let val;
-      try {
-        val = Message$ReventlessCore.decode(commandJson, commandSchema);
-      } catch (raw_err) {
-        let err = Primitive_exceptions.internalToException(raw_err);
-        let hook = Plugin_ResolverError$ReventlessCore.onResolverErrorHook.contents;
-        if (hook !== undefined) {
-          hook({
-            pluginName: "",
-            componentName: serviceName,
-            attemptedCommandType: Message$ReventlessCore.variantNameOfJson(commandJson),
-            timestamp: Message$ReventlessCore.nowAsISOString()
-          });
-        }
-        let message = Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message);
-        let reason = message !== undefined ? message : Stdlib_Option.getOr(JSON.stringify(err), "unknown error");
-        return Plugin_ResolverError$ReventlessCore.throwCallerFault(`Error: Couldn't decode ` + JSON.stringify(commandJson) + `: ` + reason);
+function makeGenerateCommand(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, stripIdFromParamsOpt, partitionTag) {
+  let stripIdFromParams = stripIdFromParamsOpt !== undefined ? stripIdFromParamsOpt : true;
+  return payload => Effect.flatMap(Effect.tap(Effect.sync(() => {
+    let msgId = Message$ReventlessCore.uuid();
+    let meta_time = Message$ReventlessCore.nowAsISOString();
+    let meta_ip = Stdlib_Option.getOr(payload.meta.ip.shift(), "");
+    let meta_user = payload.meta.user;
+    let meta = {
+      service: serviceName,
+      time: meta_time,
+      ip: meta_ip,
+      user: meta_user,
+      msgId: msgId,
+      correlationId: msgId
+    };
+    let obj = Stdlib_Option.flatMap(JSON.stringify(payload.arguments), jsonString => Stdlib_JSON.Decode.object(JSON.parse(jsonString)));
+    let params = obj !== undefined ? (stripIdFromParams ? Stdlib_Dict.$$delete(obj, "id") : undefined, dropNullArguments(obj), stampOwnerFields(obj, commandSchema, payload.command, payload.identity, serviceName), Object.entries(obj)) : Stdlib_JsError.throwWithMessage("Couldn't decode:" + Stdlib_Option.getOr(JSON.stringify(payload.arguments), "<payload.arguments>"));
+    let commandStr = payload.command;
+    let match = params.length;
+    let commandJson = match !== 0 ? Object.fromEntries([[
+          "TAG",
+          commandStr
+        ]].concat(params)) : commandStr;
+    let suppliedId = payload.arguments.id;
+    let id;
+    id = componentKind === "Aggregate" || !(suppliedId == null) ? suppliedId : Stdlib_Option.mapOr(partitionTag, "", pt => DcbTag$Reventless.partitionValueOfTags(DcbTag$Reventless.extractTagsFromJson(commandSchema, commandJson), pt));
+    return [
+      meta,
+      commandJson,
+      id
+    ];
+  }), param => {
+    let commandJson = param[1];
+    return EffectLogger$ReventlessCore.logInfo(`CommandGenerator(` + serviceName + `)`, commandJson, `generated command: ` + LogFormat$ReventlessCore.cmdLabelOfJson(commandJson));
+  }), param => {
+    let id = param[2];
+    let commandJson = param[1];
+    let meta = param[0];
+    let val;
+    try {
+      val = Message$ReventlessCore.decode(commandJson, commandSchema);
+    } catch (raw_err) {
+      let err = Primitive_exceptions.internalToException(raw_err);
+      let hook = Plugin_ResolverError$ReventlessCore.onResolverErrorHook.contents;
+      if (hook !== undefined) {
+        hook({
+          pluginName: "",
+          componentName: serviceName,
+          attemptedCommandType: Message$ReventlessCore.variantNameOfJson(commandJson),
+          timestamp: Message$ReventlessCore.nowAsISOString()
+        });
       }
-      let interceptor = commandInterceptorHook.contents;
-      let interceptEffect = interceptor !== undefined ? Effect.promise(() => interceptor(payload.identity, serviceName, componentKind, payload.command, payload.arguments)) : Effect.succeed("Allow");
-      return Effect.flatMap(interceptEffect, interceptResult => {
-        if (typeof interceptResult !== "object") {
-          if (publishJsonsAndWait !== undefined) {
-            return Effect.map(Effect.promise(() => publishJsonsAndWait([{
-                id: id,
-                meta: meta,
-                commandJson: commandJson
-              }])), outcomes => {
-              let payload = outcomes[0];
-              switch (payload.TAG) {
-                case "Accepted" :
-                  if (!Stdlib_Option.isNone(payload.entityId)) {
-                    return payload;
-                  }
-                  let newrecord = {...payload};
-                  newrecord.entityId = id;
-                  return newrecord;
-                case "Rejected" :
-                case "Pending" :
+      let message = Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message);
+      let reason = message !== undefined ? message : Stdlib_Option.getOr(JSON.stringify(err), "unknown error");
+      return Plugin_ResolverError$ReventlessCore.throwCallerFault(`Error: Couldn't decode ` + JSON.stringify(commandJson) + `: ` + reason);
+    }
+    let interceptor = commandInterceptorHook.contents;
+    let interceptEffect = interceptor !== undefined ? Effect.promise(() => interceptor(payload.identity, serviceName, componentKind, payload.command, payload.arguments)) : Effect.succeed("Allow");
+    return Effect.flatMap(interceptEffect, interceptResult => {
+      if (typeof interceptResult !== "object") {
+        if (publishJsonsAndWait !== undefined) {
+          return Effect.map(Effect.promise(() => publishJsonsAndWait([{
+              id: id,
+              meta: meta,
+              commandJson: commandJson
+            }])), outcomes => {
+            let payload = outcomes[0];
+            switch (payload.TAG) {
+              case "Accepted" :
+                if (!Stdlib_Option.isNone(payload.entityId)) {
                   return payload;
-              }
-            });
-          } else {
-            return Effect.map(Effect.promise(() => publishJsons([{
-                id: id,
-                meta: meta,
-                commandJson: commandJson
-              }])), () => ({
-              TAG: "Pending",
-              msgId: meta.msgId
-            }));
-          }
+                }
+                let newrecord = {...payload};
+                newrecord.entityId = id;
+                return newrecord;
+              case "Rejected" :
+              case "Pending" :
+                return payload;
+            }
+          });
         } else {
-          return Stdlib_JsError.throwWithMessage(interceptResult._0);
+          return Effect.map(Effect.promise(() => publishJsons([{
+              id: id,
+              meta: meta,
+              commandJson: commandJson
+            }])), () => ({
+            TAG: "Pending",
+            msgId: meta.msgId
+          }));
         }
-      });
+      } else {
+        return Stdlib_JsError.throwWithMessage(interceptResult._0);
+      }
     });
-  };
+  });
 }
 
 function Make(Spec) {

package/src/components/Counter/Counter_Callback.res.mjs

@@ -12,7 +12,7 @@ import * as ComponentType$ReventlessCore from "../../ComponentType.res.mjs";
 
 let countsStateSchema = Sury.$schema(s => ({
   id: s.m(Sury.string),
-  count: s.m(Sury.int)
+  count: s.m(Sury.int32)
 }));
 
 function groupByCounterId(references) {

package/src/components/Counter/Counter_Operations.res.mjs

@@ -9,7 +9,7 @@ import * as EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
 
 let referencesStateSchema = Sury.$schema(s => ({
   id: s.m(Sury.string),
-  inc: s.m(Sury.int)
+  inc: s.m(Sury.int32)
 }));
 
 function groupCountItemsByCounterId(countItems) {

package/src/components/EventCollector/EventCollector_Builder.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Effect from "@reventlessdev/rescript-effect/src/Effect.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stream from "effect/Stream";
@@ -9,7 +9,7 @@ import * as ComponentType$ReventlessCore from "../../ComponentType.res.mjs";
 import * as EventCollector$ReventlessCore from "./EventCollector.res.mjs";
 
 function makeStreamHandler(eventCollector, schema, jsonEventsHandler) {
-  let jsonHandler = stream => jsonEventsHandler(Stream.mapEffect(stream, json => Effect.trySync(_exn => "decode error", () => S.parseOrThrow(json, schema))));
+  let jsonHandler = stream => jsonEventsHandler(Stream.mapEffect(stream, json => Effect.trySync(_exn => "decode error", () => Sury.parseOrThrow(json, schema))));
   let channel = eventCollector.channel;
   return channel.handleChannelEvent(jsonHandler);
 }
@@ -61,4 +61,4 @@ export {
   makeStreamHandler,
   Make,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

package/src/components/InboundTranslationSlice/InboundTranslationSlice_Callback.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import * as Sury from "sury";
 import * as Uuid from "uuid";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
@@ -20,7 +19,7 @@ let auditRowSchema = Sury.$schema(s => ({
   input: s.m(Sury.string),
   status: s.m(auditStatusSchema),
   targetIds: s.m(Sury.$option(Sury.array(Sury.string))),
-  commandCount: s.m(Sury.$option(Sury.int)),
+  commandCount: s.m(Sury.$option(Sury.int32)),
   error: s.m(Sury.$option(Sury.string)),
   receivedAt: s.m(Sury.string)
 }));
@@ -75,7 +74,7 @@ function Make(Spec) {
       try {
         input = {
           TAG: "Ok",
-          _0: S.parseOrThrow(inputJson, Spec.externalInputSchema)
+          _0: Sury.parseOrThrow(inputJson, Spec.externalInputSchema)
         };
       } catch (raw_exn) {
         let exn = Primitive_exceptions.internalToException(raw_exn);

package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Callback.res.mjs

@@ -25,8 +25,8 @@ let todoRowSchema = Sury.$schema(s => ({
   createdAt: s.m(Sury.string),
   processedAt: s.m(Sury.$option(Sury.string)),
   completedAt: s.m(Sury.$option(Sury.string)),
-  retryCount: s.m(Sury.int),
-  maxRetries: s.m(Sury.$option(Sury.int)),
+  retryCount: s.m(Sury.int32),
+  maxRetries: s.m(Sury.$option(Sury.int32)),
   lastError: s.m(Sury.$option(Sury.string))
 }));
 
@@ -37,8 +37,8 @@ function todoRowSchemaFor(itemSchema) {
     createdAt: s.m(Sury.string),
     processedAt: s.m(Sury.$option(Sury.string)),
     completedAt: s.m(Sury.$option(Sury.string)),
-    retryCount: s.m(Sury.int),
-    maxRetries: s.m(Sury.$option(Sury.int)),
+    retryCount: s.m(Sury.int32),
+    maxRetries: s.m(Sury.$option(Sury.int32)),
     lastError: s.m(Sury.$option(Sury.string))
   }));
 }

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

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
@@ -461,7 +461,7 @@ function Make(Spec) {
           let extensionPointsOutputs = match$1[0];
           let coreSetup;
           if (interstackAdminExtensionPoints !== undefined) {
-            let pluginExtensionPointUnwrapped = S.parseOrThrow(StackReference$Pulumi.get(interstackAdminExtensionPoints, PluginExtensionPointSpec$ReventlessInfra.name), ExtensionPoint$ReventlessInterop.resolvedOutputsSchema);
+            let pluginExtensionPointUnwrapped = Sury.parseOrThrow(StackReference$Pulumi.get(interstackAdminExtensionPoints, PluginExtensionPointSpec$ReventlessInfra.name), ExtensionPoint$ReventlessInterop.resolvedOutputsSchema);
             let pluginExtensionPointCommandTopicRemoteChannel = PluginExtensionPointRemoteChannel.make(pluginExtensionPointUnwrapped.commandTopic.resources.map(Adapter$ReventlessCore.fromInteropResolved));
             coreSetup = [
               pluginExtensionPointUnwrapped,
@@ -671,4 +671,4 @@ export {
   PluginExtensionPointSpec,
   Make,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

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

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
@@ -79,7 +79,7 @@ function getRemoteStorageResources(pluginName, queryDbName) {
         return [];
       }
       try {
-        let readModel = S.parseOrThrow(rawReadModel, ReadModel$ReventlessInterop.resolvedOutputsSchema);
+        let readModel = Sury.parseOrThrow(rawReadModel, ReadModel$ReventlessInterop.resolvedOutputsSchema);
         return Adapter$ReventlessCore.fromInteropResources(readModel.queryDb.resources);
       } catch (raw_exn) {
         let exn = Primitive_exceptions.internalToException(raw_exn);

package/src/plugin/component/Plugin_Structure.res

@@ -648,6 +648,9 @@ let identityReference = (
 // element schema.
 let extractReferences = (
   ~identityViews: option<identityViews>=?,
+  // The id a creating command mints. Its identity names the row the command
+  // brings into existence, not one it refers to, so nothing is derived for it.
+  ~minted: option<string>=?,
   properties: dict<S.t<unknown>>,
 ): array<Reventless.Plugin.fieldReference> =>
   properties
@@ -660,8 +663,9 @@ let extractReferences = (
     // nesting and the other not.
     let declared = Reventless.Reference.collectFieldTargets(fieldName, fieldSchema)
     let targets = switch identityViews {
-    | Some(views) => identityReference(views, ~fieldName, fieldSchema, declared)
-    | None => declared
+    | Some(views) if minted != Some(fieldName) =>
+      identityReference(views, ~fieldName, fieldSchema, declared)
+    | _ => declared
     }
     targets->Array.map(((path, target)): Reventless.Plugin.fieldReference => {
       Reventless.Plugin.fieldName: path,
@@ -849,7 +853,6 @@ let toCommandDef = (
       ~variantName,
       properties,
     )
-    let references = extractReferences(~identityViews?, properties)
     // Evaluated against a synthetic value per constructor, the same shape the
     // resolver builds at call time: a payload-bearing variant compiles to
     // `{TAG, ...}`, a payload-less one to a bare string.
@@ -913,6 +916,11 @@ let toCommandDef = (
     | None => Reventless.Transition.targetState(declared)
     }
     let level = derived->Option.flatMap(d => d.level)->Option.getOr(guessedLevel)
+    let references = extractReferences(
+      ~identityViews?,
+      ~minted=?level == Reventless.Plugin.Collection ? aggregateIdField : None,
+      properties,
+    )
     // API-exposed iff the whole command isn't @noApi and this variant
     // isn't in its @noApi-variants set — mirrors the API-generation filter
     // (Plugin_Helpers / PluginBaseFragment). Drives the event-graph API badge.

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

@@ -481,12 +481,12 @@ function identityReference(identityViews, fieldName, fieldSchema, declared) {
     ]];
 }
 
-function extractReferences(identityViews, properties) {
+function extractReferences(identityViews, minted, properties) {
   return Object.entries(properties).flatMap(param => {
     let fieldSchema = param[1];
     let fieldName = param[0];
     let declared = Reference$Reventless.collectFieldTargets(fieldName, fieldSchema);
-    let targets = identityViews !== undefined ? identityReference(identityViews, fieldName, fieldSchema, declared) : declared;
+    let targets = identityViews !== undefined && Primitive_object.notequal(minted, fieldName) ? identityReference(identityViews, fieldName, fieldSchema, declared) : declared;
     return targets.map(param => {
       let target = param[1];
       return {
@@ -500,7 +500,7 @@ function extractReferences(identityViews, properties) {
 
 function toEventDef(identityViews, v) {
   let mkDef = (variantName, properties) => {
-    let references = extractReferences(identityViews, properties);
+    let references = extractReferences(identityViews, undefined, properties);
     return {
       name: variantName,
       schema: JSON.stringify(SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, v)),
@@ -643,7 +643,7 @@ function annotateArgTypes(schema, argTypes) {
 function toCommandDef(identityViews, isAggregate, partitionKey, mutationFieldFor, parentSchema, commandAuthorization, commandTransition, derivedEdgeFor, v) {
   let mkDef = (variantName, properties) => {
     let match = commandLevelAndId(isAggregate, partitionKey, variantName, properties);
-    let references = extractReferences(identityViews, properties);
+    let aggregateIdField = match[1];
     let syntheticCommand = DcbTag$Reventless.isVariantPayloadBearing(parentSchema, variantName) ? ({
         TAG: variantName
       }) : variantName;
@@ -678,6 +678,7 @@ function toCommandDef(identityViews, isAggregate, partitionKey, mutationFieldFor
     });
     let targetState = observed !== undefined ? observed : Transition$Reventless.targetState(declared);
     let level = Stdlib_Option.getOr(Stdlib_Option.flatMap(derived, d => d.level), match[0]);
+    let references = extractReferences(identityViews, level === "Collection" ? aggregateIdField : undefined, properties);
     let apiExposed = false;
     if (!ApiNoApiHelpers$ReventlessCore.isNoApi(parentSchema)) {
       let excluded = ApiNoApiHelpers$ReventlessCore.getExcludedVariants(parentSchema);
@@ -691,7 +692,7 @@ function toCommandDef(identityViews, isAggregate, partitionKey, mutationFieldFor
       name: variantName,
       schema: JSON.stringify(annotatedSchema),
       level: level,
-      aggregateIdField: match[1],
+      aggregateIdField: aggregateIdField,
       mutationField: mutationField,
       references: references,
       allowedStates: match$3[0],

package/src/plugin/lifecycle/PluginBehavior.res.mjs

@@ -20,7 +20,7 @@ let knownVersionSchema = Sury.$schema(s => ({
 
 let stateSchema = Sury.$schema(s => ({
   current: s.m(Sury.$option(Plugin$Reventless.versionSchema)),
-  known: s.m(Sury.dict(knownVersionSchema))
+  known: s.m(Sury.record(knownVersionSchema))
 }));
 
 let initialState_known = {};

package/src/util/Interstack.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
@@ -25,7 +25,7 @@ function fromJson(json) {
   try {
     return {
       TAG: "Ok",
-      _0: S.parseOrThrow(json, Task$ReventlessInterop.resolvedOutputsSchema)
+      _0: Sury.parseOrThrow(json, Task$ReventlessInterop.resolvedOutputsSchema)
     };
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
@@ -54,7 +54,7 @@ function fromJson$1(json) {
   try {
     return {
       TAG: "Ok",
-      _0: S.parseOrThrow(json, EventMapper$ReventlessInterop.resolvedOutputsSchema)
+      _0: Sury.parseOrThrow(json, EventMapper$ReventlessInterop.resolvedOutputsSchema)
     };
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
@@ -88,7 +88,7 @@ function fromJson$2(json) {
   try {
     return {
       TAG: "Ok",
-      _0: S.parseOrThrow(json, ExtensionPoint$ReventlessInterop.resolvedOutputsSchema)
+      _0: Sury.parseOrThrow(json, ExtensionPoint$ReventlessInterop.resolvedOutputsSchema)
     };
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);

package/tests/aggregate/AggregateCacheTest.res.mjs

@@ -25,7 +25,7 @@ let eventSchema = Sury.union([
   })),
   Sury.$schema(s => ({
     TAG: "CheckpointTaken",
-    count: s.m(Sury.int)
+    count: s.m(Sury.int32)
   }))
 ]);
 

package/tests/api/BrandedMarkerCompositionTest.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import * as Sury from "sury";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Owner$Reventless from "@reventlessdev/reventless-spec/src/components/Owner.res.mjs";
@@ -28,7 +27,7 @@ globalThis.describe("a field marker on a branded semantic:", () => {
           return false;
         }
         try {
-          S.parseOrThrow(raw, schema);
+          Sury.parseOrThrow(raw, schema);
           return true;
         } catch (exn) {
           return false;
@@ -54,7 +53,7 @@ globalThis.describe("a field marker on a branded semantic:", () => {
           return false;
         }
         try {
-          S.parseOrThrow(raw, schema);
+          Sury.parseOrThrow(raw, schema);
           return true;
         } catch (exn) {
           return false;

package/tests/api/GeolocationSemanticTest.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import * as Sury from "sury";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Semantic$Reventless from "@reventlessdev/reventless-spec/src/semantic/Semantic.res.mjs";
@@ -89,7 +88,7 @@ globalThis.describe("a row in the pre-union shape does not decode", () => {
   globalThis.test("the three-field shape is refused against the union schema", () => {
     let decodes;
     try {
-      S.parseOrThrow(oldShapedRow, stateSchema);
+      Sury.parseOrThrow(oldShapedRow, stateSchema);
       decodes = true;
     } catch (exn) {
       decodes = false;