@reventlessdev/reventless-aws 3.0.0-alpha.217 → 3.0.0-alpha.219

package/src/adapter/Api/AppSync_SourceApiAssociation_Retrying.res.mjs

@@ -0,0 +1,340 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Alias$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Alias.res.mjs";
+import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
+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 Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Logger$ReventlessCore from "@reventlessdev/reventless-core/src/util/Logger.res.mjs";
+import * as IndexJs from "@pulumi/pulumi/dynamic/index.js";
+
+let log = Logger$ReventlessCore.fromEnv();
+
+let newOf1 = ((C, x) => new C(x));
+
+let newOf0 = ((C) => new C());
+
+let _sdk = {
+  contents: undefined
+};
+
+let _client = {
+  contents: undefined
+};
+
+async function getSdk() {
+  let m = _sdk.contents;
+  if (m !== undefined) {
+    return m;
+  }
+  let m$1 = await import("@aws-sdk/client-appsync");
+  _sdk.contents = m$1;
+  return m$1;
+}
+
+async function getClient() {
+  let c = _client.contents;
+  if (c !== undefined) {
+    return Primitive_option.valFromOption(c);
+  }
+  let sdk = await getSdk();
+  let c$1 = newOf0(sdk.AppSyncClient);
+  _client.contents = Primitive_option.some(c$1);
+  return c$1;
+}
+
+let transientNames = [
+  "ConcurrentModificationException",
+  "ThrottlingException",
+  "TooManyRequestsException",
+  "InternalFailureException",
+  "ServiceUnavailableException",
+  "ServiceUnavailable"
+];
+
+function isConcurrentModificationError(jsErr) {
+  let match = jsErr.name;
+  let match$1 = Stdlib_JsExn.message(jsErr);
+  if (match == null) {
+    if (match$1 !== undefined) {
+      return match$1.includes("ConcurrentModificationException");
+    } else {
+      return false;
+    }
+  } else if (match === "ConcurrentModificationException") {
+    return true;
+  } else if (match$1 !== undefined) {
+    return match$1.includes("ConcurrentModificationException");
+  } else {
+    return false;
+  }
+}
+
+function isRetryableAssociationError(jsErr) {
+  let match = jsErr.name;
+  let match$1 = Stdlib_JsExn.message(jsErr);
+  if (!(match == null) && transientNames.includes(match)) {
+    return true;
+  }
+  if (match$1 !== undefined) {
+    return transientNames.some(n => match$1.includes(n));
+  } else {
+    return false;
+  }
+}
+
+function isAlreadyGoneError(jsErr) {
+  let match = jsErr.name;
+  let match$1 = Stdlib_JsExn.message(jsErr);
+  if (!(match == null) && match === "NotFoundException") {
+    return true;
+  }
+  if (match$1 !== undefined) {
+    if (match$1.includes("NotFoundException")) {
+      return true;
+    } else {
+      return match$1.includes("not found");
+    }
+  } else {
+    return false;
+  }
+}
+
+let jsThrow = (e => { throw e });
+
+async function runWithRetry(attemptOpt, maxAttemptsOpt, delayMsOpt, maxDelayMsOpt, makeCall) {
+  let attempt = attemptOpt !== undefined ? attemptOpt : 0;
+  let maxAttempts = maxAttemptsOpt !== undefined ? maxAttemptsOpt : 8;
+  let delayMs = delayMsOpt !== undefined ? delayMsOpt : 2000;
+  let maxDelayMs = maxDelayMsOpt !== undefined ? maxDelayMsOpt : 30000;
+  try {
+    return await makeCall();
+  } catch (raw_exn) {
+    let exn = Primitive_exceptions.internalToException(raw_exn);
+    let jsExn = Stdlib_JsExn.fromException(exn);
+    let name = Stdlib_Option.getOr(Stdlib_Option.flatMap(jsExn, prim => Primitive_option.fromNullable(prim.name)), "(no name)");
+    let msg = Stdlib_Option.getOr(Stdlib_Option.flatMap(jsExn, Stdlib_JsExn.message), "(no message)");
+    let isRetryable = attempt < maxAttempts && Stdlib_Option.mapOr(jsExn, false, isRetryableAssociationError);
+    if (isRetryable) {
+      log.info("AppSync_SourceApiAssociation_Retrying", undefined, `attempt ` + (attempt + 1 | 0).toString() + `/` + maxAttempts.toString() + ` failed, retrying in ` + delayMs.toString() + `ms: ` + name + `: ` + msg);
+      await new Promise((resolve, param) => {
+        setTimeout(resolve, delayMs);
+      });
+      let nextDelay = (delayMs << 1);
+      let cappedDelay = nextDelay > maxDelayMs ? maxDelayMs : nextDelay;
+      return await runWithRetry(attempt + 1 | 0, maxAttempts, cappedDelay, maxDelayMs, makeCall);
+    }
+    if (attempt > 0) {
+      log.warn("AppSync_SourceApiAssociation_Retrying", undefined, `giving up after ` + (attempt + 1 | 0).toString() + ` attempts: ` + name + `: ` + msg);
+    }
+    if (jsExn !== undefined) {
+      return jsThrow(Primitive_option.valFromOption(jsExn));
+    }
+    throw exn;
+  }
+}
+
+function idsFromArn(arn) {
+  let parts = arn.split("/");
+  let idx = parts.indexOf("sourceApiAssociations");
+  let match = idx >= 1;
+  let match$1 = parts[idx - 1 | 0];
+  let match$2 = parts[idx + 1 | 0];
+  if (match && match$1 !== undefined && match$2 !== undefined) {
+    return {
+      associationId: match$2,
+      mergedApiIdentifier: match$1
+    };
+  }
+}
+
+function idsFromComposite(id) {
+  let match = id.split(",");
+  if (match.length !== 2) {
+    return;
+  }
+  let mergedApiId = match[0];
+  let assocId = match[1];
+  return {
+    associationId: assocId,
+    mergedApiIdentifier: mergedApiId
+  };
+}
+
+function identifiersFrom(id, props) {
+  let ids = idsFromArn(id);
+  if (ids !== undefined) {
+    return ids;
+  }
+  let ids$1 = idsFromComposite(id);
+  if (ids$1 !== undefined) {
+    return ids$1;
+  }
+  let ids$2 = idsFromArn(props.arn);
+  if (ids$2 !== undefined) {
+    return ids$2;
+  }
+}
+
+function extractIds(resp) {
+  let match = resp.sourceApiAssociation;
+  if (match === undefined) {
+    return Stdlib_JsError.throwWithMessage("CreateSourceApiAssociation returned no associationArn / associationId");
+  }
+  let aid = match.associationId;
+  if (aid === undefined) {
+    return Stdlib_JsError.throwWithMessage("CreateSourceApiAssociation returned no associationArn / associationId");
+  }
+  let arn = match.associationArn;
+  if (arn !== undefined) {
+    return [
+      arn,
+      aid
+    ];
+  } else {
+    return Stdlib_JsError.throwWithMessage("CreateSourceApiAssociation returned no associationArn / associationId");
+  }
+}
+
+async function create(inputs) {
+  let sdk = await getSdk();
+  let client = await getClient();
+  let match = await runWithRetry(undefined, undefined, undefined, undefined, () => client.send(newOf1(sdk.CreateSourceApiAssociationCommand, {
+    mergedApiIdentifier: inputs.mergedApiIdentifier,
+    sourceApiIdentifier: inputs.sourceApiIdentifier,
+    sourceApiAssociationConfig: {
+      mergeType: inputs.mergeType
+    }
+  })).then(extractIds));
+  let arn = match[0];
+  return {
+    id: arn,
+    outs: {
+      arn: arn,
+      associationId: match[1],
+      mergedApiIdentifier: inputs.mergedApiIdentifier,
+      sourceApiIdentifier: inputs.sourceApiIdentifier,
+      mergeType: inputs.mergeType
+    }
+  };
+}
+
+async function update(_id, olds, _news) {
+  return {
+    outs: olds
+  };
+}
+
+async function delete_(id, props) {
+  let sdk = await getSdk();
+  let client = await getClient();
+  let ids = identifiersFrom(id, props);
+  if (ids === undefined) {
+    return log.warn("AppSync_SourceApiAssociation_Retrying", undefined, `delete: could not derive association identifiers from id "` + id + `"; treating as already gone`);
+  }
+  try {
+    return await runWithRetry(undefined, undefined, undefined, undefined, () => client.send(newOf1(sdk.DeleteSourceApiAssociationCommand, ids)));
+  } catch (raw_exn) {
+    let exn = Primitive_exceptions.internalToException(raw_exn);
+    if (Stdlib_Option.mapOr(Stdlib_JsExn.fromException(exn), false, isAlreadyGoneError)) {
+      return;
+    }
+    throw exn;
+  }
+}
+
+let isDefined = (x => x !== undefined && x !== null);
+
+function diff_(_id, olds, news) {
+  let replaces = Stdlib_Array.filterMap([
+    isDefined(olds.mergedApiIdentifier) && olds.mergedApiIdentifier !== news.mergedApiIdentifier ? "mergedApiIdentifier" : undefined,
+    isDefined(olds.sourceApiIdentifier) && olds.sourceApiIdentifier !== news.sourceApiIdentifier ? "sourceApiIdentifier" : undefined,
+    isDefined(olds.mergeType) && olds.mergeType !== news.mergeType ? "mergeType" : undefined
+  ], x => x);
+  return {
+    changes: replaces.length !== 0,
+    replaces: replaces,
+    deleteBeforeReplace: false
+  };
+}
+
+async function read_(id, props) {
+  let sdk = await getSdk();
+  let client = await getClient();
+  let ids = identifiersFrom(id, props);
+  if (ids === undefined) {
+    return {};
+  }
+  try {
+    await client.send(newOf1(sdk.GetSourceApiAssociationCommand, ids));
+    return {
+      id: id,
+      props: props
+    };
+  } catch (raw_exn) {
+    let exn = Primitive_exceptions.internalToException(raw_exn);
+    if (Stdlib_Option.mapOr(Stdlib_JsExn.fromException(exn), false, isAlreadyGoneError)) {
+      log.info("AppSync_SourceApiAssociation_Retrying", undefined, `association ` + ids.associationId + ` on ` + ids.mergedApiIdentifier + ` missing in AppSync; reporting drift`);
+      return {};
+    }
+    let jsExn = Stdlib_JsExn.fromException(exn);
+    if (jsExn !== undefined) {
+      return jsThrow(Primitive_option.valFromOption(jsExn));
+    }
+    throw exn;
+  }
+}
+
+let provider = {
+  create: create,
+  update: update,
+  delete: delete_,
+  diff: diff_,
+  read: read_
+};
+
+function make(name, props, opts) {
+  let migrationAlias = Alias$Pulumi.make(name, "aws:appsync/sourceApiAssociation:SourceApiAssociation", undefined);
+  let finalOpts;
+  if (opts !== undefined) {
+    let newrecord = {...opts};
+    newrecord.aliases = [migrationAlias];
+    finalOpts = newrecord;
+  } else {
+    finalOpts = {
+      aliases: [migrationAlias]
+    };
+  }
+  return new IndexJs.Resource(provider, name, props, finalOpts);
+}
+
+export {
+  log,
+  newOf1,
+  newOf0,
+  _sdk,
+  _client,
+  getSdk,
+  getClient,
+  transientNames,
+  isConcurrentModificationError,
+  isRetryableAssociationError,
+  isAlreadyGoneError,
+  jsThrow,
+  runWithRetry,
+  idsFromArn,
+  idsFromComposite,
+  identifiersFrom,
+  extractIds,
+  create,
+  update,
+  delete_,
+  isDefined,
+  diff_,
+  read_,
+  provider,
+  make,
+}
+/* log Not a pure module */

package/src/adapter/Mcp/MCP_Lambda.res

@@ -322,14 +322,6 @@ external makeGenerateCommand: (
 external sqsPublishJsons: ('queue, string) => ReventlessCore.CommandGenerator.publishJsons =
   "publishJsons"
 
-@module("@reventlessdev/reventless-core/src/RequestContext.res.mjs")
-external requestContextTag: 'a = "tag"
-
-@module("effect/Effect")
-external effectProvideService: ('a, 'b) => 'c = "provideService"
-
-@send external pipe: ('a, 'b) => 'c = "pipe"
-
 let makeQueueRef: string => 'a = %raw(`(url) => ({ id: url, name: url, arn: "" })`)
 
 // Decode the payload section of a JWT (base64url → JSON) without signature verification.
@@ -384,16 +376,6 @@ let extractIdentity = (authHeader: option<string>): Reventless.Identity.t =>
     }
   }
 
-let runEffect = (correlationId: option<string>, effect) =>
-  effect
-  ->pipe(
-    effectProvideService(
-      requestContextTag,
-      {"correlationId": correlationId->Option.getOr("unknown")},
-    ),
-  )
-  ->pipe(Effect.runPromise)
-
 /** Dispatch an MCP tool call through makeGenerateCommand so the interceptor hook fires.
     The commandTopicArn from mcpConfig tells us which SQS FIFO queue to target. */
 let dispatchTool = async (
@@ -416,7 +398,14 @@ let dispatchTool = async (
     meta: {ip: [], user: identity.userId, info: `mcp/tools/${tool.name}`},
     identity,
   }
-  await runEffect(None, generateCommand(payload))
+  // Route through the shared dispatch helper so this tool call gets the same
+  // correlationId / comp log annotation and a populated RequestContext (identity
+  // included) as every other dispatch boundary.
+  await ReventlessCore.Runtime.runEffect(
+    ~comp=`Mcp(${tool.name})`,
+    ~identity,
+    generateCommand(payload),
+  )
 }
 
 // ─── Deploy-time infrastructure (placeholder) ─────────────────────────────

package/src/adapter/Mcp/MCP_Lambda.res.mjs

@@ -10,13 +10,13 @@ import * as Stream$1 from "effect/Stream";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as AWS$ReventlessAws from "../AWS.res.mjs";
 import * as Identity$Reventless from "@reventlessdev/reventless-spec/src/types/Identity.res.mjs";
+import * as Runtime$ReventlessCore from "@reventlessdev/reventless-core/src/adapter/Runtime/Runtime.res.mjs";
 import * as AdminApi$ReventlessCore from "@reventlessdev/reventless-core/src/admin/AdminApi.res.mjs";
 import * as DynamoDb_Error$ReventlessAws from "../../errors/DynamoDb_Error.res.mjs";
 import * as PluginBaseFragment$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/api/PluginBaseFragment.res.mjs";
 import * as MCP_SchemaGenerator$ReventlessCore from "@reventlessdev/reventless-core/src/components/Api/MCP_SchemaGenerator.res.mjs";
 import * as Util_DynamoDb_Runtime$ReventlessAws from "../../util/Util_DynamoDb_Runtime.res.mjs";
 import * as DcbEventLogStorage_DynamoDb_Runtime$ReventlessAws from "../DcbEventLog/DcbEventLogStorage_DynamoDb_Runtime.res.mjs";
-import * as RequestContextResMjs from "@reventlessdev/reventless-core/src/RequestContext.res.mjs";
 import * as CommandTopicChannel_SQS_RuntimeResMjs from "@reventlessdev/reventless-aws/src/adapter/CommandTopic/CommandTopicChannel_SQS_Runtime.res.mjs";
 import * as CommandGenerator_CallbackResMjs from "@reventlessdev/reventless-core/src/components/CommandGenerator/CommandGenerator_Callback.res.mjs";
 
@@ -247,12 +247,6 @@ function extractIdentity(authHeader) {
   };
 }
 
-function runEffect(correlationId, effect) {
-  return effect.pipe(Effect.provideService(RequestContextResMjs.tag, {
-    correlationId: Stdlib_Option.getOr(correlationId, "unknown")
-  })).pipe(prim => Effect.runPromise(prim));
-}
-
 async function dispatchTool(tool, args, identity) {
   let queueRef = makeQueueRef(tool.commandTopicArn);
   let publishJsons = CommandTopicChannel_SQS_RuntimeResMjs.publishJsons(queueRef, AWS$ReventlessAws.SQS_FIFO.service);
@@ -269,7 +263,7 @@ async function dispatchTool(tool, args, identity) {
     meta: payload_meta,
     identity: identity
   };
-  return await runEffect(undefined, generateCommand(payload));
+  return await Runtime$ReventlessCore.runEffect(undefined, undefined, `Mcp(` + tool.name + `)`, undefined, identity, undefined, generateCommand(payload));
 }
 
 export {
@@ -283,7 +277,6 @@ export {
   makeQueueRef,
   decodeJwtClaims,
   extractIdentity,
-  runEffect,
   dispatchTool,
 }
 /* S Not a pure module */

package/src/adapter/Runtime/RuntimeEnvironment_Lambda.res

@@ -284,7 +284,8 @@ let groupBySource = (event: event) => {
 // SQS records carry a `body` string field not included in the minimal record type.
 @get external recordBody: PulumiAws.Lambda.CallbackFunction.record => option<string> = "body"
 
-let extractCorrelationId = (event: event) =>
+// Read a single string field off the first SQS record's `meta` object.
+let extractMetaField = (event: event, field) =>
   event.records
   ->Array.get(0)
   ->Option.flatMap(r =>
@@ -298,9 +299,12 @@ let extractCorrelationId = (event: event) =>
   )
   ->Option.flatMap(obj => obj->Dict.get("meta"))
   ->Option.flatMap(JSON.Decode.object)
-  ->Option.flatMap(meta => meta->Dict.get("correlationId"))
+  ->Option.flatMap(meta => meta->Dict.get(field))
   ->Option.flatMap(JSON.Decode.string)
 
+let extractCorrelationId = (event: event) => event->extractMetaField("correlationId")
+let extractCausationId = (event: event) => event->extractMetaField("causationId")
+
 external asEventHandler: 'a => ReventlessCore.Runtime.eventHandler<event, context, 'result> =
   "%identity"
 external asEffectHandler: 'a => ReventlessCore.Runtime.effectHandler<

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

@@ -172,14 +172,22 @@ function groupBySource(event) {
   return dict;
 }
 
-function extractCorrelationId(event) {
+function extractMetaField(event, field) {
   return Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(event.Records[0], r => Stdlib_Option.flatMap(r.body, body => {
     try {
       return Stdlib_JSON.Decode.object(JSON.parse(body));
     } catch (exn) {
       return;
     }
-  })), obj => obj["meta"]), Stdlib_JSON.Decode.object), meta => meta["correlationId"]), Stdlib_JSON.Decode.string);
+  })), obj => obj["meta"]), Stdlib_JSON.Decode.object), meta => meta[field]), Stdlib_JSON.Decode.string);
+}
+
+function extractCorrelationId(event) {
+  return extractMetaField(event, "correlationId");
+}
+
+function extractCausationId(event) {
+  return extractMetaField(event, "causationId");
 }
 
 export {
@@ -188,6 +196,8 @@ export {
   make,
   makeFromCodeAsset,
   groupBySource,
+  extractMetaField,
   extractCorrelationId,
+  extractCausationId,
 }
 /* @pulumi/aws Not a pure module */

package/src/components/Aggregate_Builder_Micro.res.mjs

@@ -20,6 +20,7 @@ function Make(Spec) {
       make: RuntimeEnvironment_Lambda$ReventlessAws.make,
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+      extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Aggregate_Builder_NoResolver.res.mjs

@@ -20,6 +20,7 @@ function Make(Spec) {
       make: RuntimeEnvironment_Lambda$ReventlessAws.make,
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+      extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync_NoOp$ReventlessAws)({

package/src/components/Aggregate_Builder_PerAggregate.res.mjs

@@ -20,6 +20,7 @@ function Make(Spec) {
       make: RuntimeEnvironment_Lambda$ReventlessAws.make,
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+      extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Aggregate_Builder_Single.res.mjs

@@ -22,6 +22,7 @@ function Make(Spec) {
       make: RuntimeEnvironment_Lambda$ReventlessAws.make,
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+      extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Aggregate_Builder_Single_Async.res.mjs

@@ -22,6 +22,7 @@ function Make(Spec) {
       make: RuntimeEnvironment_Lambda$ReventlessAws.make,
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+      extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Api/AppSync_MergedApi.res

@@ -122,9 +122,11 @@ let make = (~name: string, ~opts: Pulumi.ComponentResource.options): t => {
 
 /** Associate a source API with the merged API under AUTO_MERGE. AWS
     serializes association CREATES per merged API (409
-    ConcurrentModificationException) — the platform stack's own associations
-    are inherently sequential; concurrent first-time plugin-stack deploys need
-    retry-with-backoff (Phase 4). */
+    ConcurrentModificationException). This platform-stack form stays on the
+    classic provider: the platform stack creates all its own associations
+    (admin + base) sequentially within one program, so they never race. The
+    cross-stack race is on the plugin-stack `associateSourceWithMergedArn`
+    path, which uses the retrying provider (Phase 4). */
 let associateSource = (
   ~name: string,
   ~mergedApi: t,
@@ -158,8 +160,15 @@ let associateSource = (
 /** Associate a source API against a merged API referenced by ARN — the
     plugin-stack form, where the merged API is not a resource in this stack
     but the platform's `domainMergedApiArn` / `platformMergedApiArn`
-    StackReference export. Same AUTO_MERGE + create-time 409 caveat as
-    `associateSource`. */
+    StackReference export.
+
+    Concurrent first-time plugin deploys race here: AWS serializes association
+    writes per merged API and 409s (`ConcurrentModificationException`). This
+    goes through `AppSync_SourceApiAssociation_Retrying`, a dynamic provider
+    that retries the 409 with backoff (Phase 4), so plugin stacks can deploy in
+    parallel without a CI-level serialization. The returned resource keeps the
+    `PulumiAws.AppSync.SourceApiAssociation.t` shape, so `mergeStatusGateWith`
+    still waits for MERGE_SUCCESS on `.associationId` unchanged. */
 let associateSourceWithMergedArn = (
   ~name: string,
   ~mergedApiArn: Pulumi.Output.t<string>,
@@ -169,20 +178,14 @@ let associateSourceWithMergedArn = (
   let customOpts: Pulumi.CustomResourceOptions.t = {
     parent: ?opts.parent,
   }
-  AppSync.SourceApiAssociation.make(
+  AppSync_SourceApiAssociation_Retrying.make(
     ~name,
-    ~args={
-      mergedApiArn: mergedApiArn->Pulumi.Output.asInput,
-      sourceApiId: sourceApi
+    ~props={
+      mergedApiIdentifier: mergedApiArn->Pulumi.Output.asInput,
+      sourceApiIdentifier: sourceApi
       ->Pulumi.Output.flatMap((a: AppSync.GraphQLApi.t) => a.id)
       ->Pulumi.Output.asInput,
-      sourceApiAssociationConfigs: [
-        (
-          {
-            mergeType: AppSync.SourceApiAssociation.AUTO_MERGE->Pulumi.Input.make,
-          }: AppSync.SourceApiAssociation.sourceApiAssociationConfig
-        )->Pulumi.Input.make,
-      ]->Pulumi.Input.make,
+      mergeType: "AUTO_MERGE"->Pulumi.Input.make,
     },
     ~opts=Some(customOpts),
   )

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

@@ -7,6 +7,7 @@ import * as Pulumi from "@pulumi/pulumi";
 import * as PolicyDocument$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/PolicyDocument.res.mjs";
 import * as Auth_Cognito$ReventlessAws from "../../adapter/Auth/Auth_Cognito.res.mjs";
 import * as AppSync_Adapter$ReventlessAws from "./AppSync_Adapter.res.mjs";
+import * as AppSync_SourceApiAssociation_Retrying$ReventlessAws from "../../adapter/Api/AppSync_SourceApiAssociation_Retrying.res.mjs";
 
 function authenticationTypeName(t) {
   switch (t) {
@@ -89,12 +90,10 @@ function associateSourceWithMergedArn(name, mergedApiArn, sourceApi, opts) {
   let customOpts = {
     parent: customOpts_parent
   };
-  return new (Aws.appsync.SourceApiAssociation)(name, {
-    mergedApiArn: mergedApiArn,
-    sourceApiId: Output$Pulumi.flatMap(sourceApi, a => a.id),
-    sourceApiAssociationConfigs: [{
-        mergeType: "AUTO_MERGE"
-      }]
+  return AppSync_SourceApiAssociation_Retrying$ReventlessAws.make(name, {
+    mergedApiIdentifier: mergedApiArn,
+    sourceApiIdentifier: Output$Pulumi.flatMap(sourceApi, a => a.id),
+    mergeType: "AUTO_MERGE"
   }, customOpts);
 }
 

package/src/components/AutomationSlice_Builder.res.mjs

@@ -14,6 +14,7 @@ function Make(Api) {
     make: RuntimeEnvironment_Lambda$ReventlessAws.make,
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+    extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/ExtensionPoint_Builder.res.mjs

@@ -16,6 +16,7 @@ function Make(Spec) {
     make: RuntimeEnvironment_Lambda$ReventlessAws.make,
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+    extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/ForeignReadModel_Builder.res.mjs

@@ -11,6 +11,7 @@ let EventCollectorRuntimeBuilder = EventCollectorRuntime_Builder_PerEventCollect
   make: RuntimeEnvironment_Lambda$ReventlessAws.make,
   groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
   extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+  extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
   asEventHandler: prim => prim,
   asEffectHandler: prim => prim
 })({
@@ -23,6 +24,7 @@ function Make(Spec) {
     make: RuntimeEnvironment_Lambda$ReventlessAws.make,
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+    extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/OutboundTranslationSlice_Builder.res.mjs

@@ -21,6 +21,7 @@ function Make(Api) {
     make: RuntimeEnvironment_Lambda$ReventlessAws.make,
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+    extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/Plugin.res.mjs

@@ -33,6 +33,7 @@ function Make(HooksConfig) {
     make: RuntimeEnvironment_Lambda$ReventlessAws.make,
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
+    extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({