@reventlessdev/reventless-aws 3.0.0-alpha.208 → 3.0.0-alpha.210

package/src/Platform.res.mjs

@@ -1,23 +1,20 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as S from "sury/src/S.res.mjs";
+import * as Pervasives from "@rescript/runtime/lib/es6/Pervasives.js";
 import * as Aws from "@pulumi/aws";
 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";
-import * as Stdlib_Float from "@rescript/runtime/lib/es6/Stdlib_Float.js";
-import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
 import * as Pulumi$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Pulumi.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
-import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
 import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as Plugin$ReventlessAws from "./components/Plugin.res.mjs";
-import * as LibDynamodb from "@aws-sdk/lib-dynamodb";
 import * as Logger$ReventlessCore from "@reventlessdev/reventless-core/src/util/Logger.res.mjs";
 import * as Message$ReventlessCore from "@reventlessdev/reventless-core/src/Message.res.mjs";
 import * as AdminApi$ReventlessCore from "@reventlessdev/reventless-core/src/admin/AdminApi.res.mjs";
@@ -32,7 +29,6 @@ import * as Plugin_Stack$ReventlessAws from "./plugin/stack/Plugin_Stack.res.mjs
 import * as UiFragments$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UiFragmentRegistry/StateViewSlice/UiFragments.res.mjs";
 import * as Util_Pulumi$ReventlessCore from "@reventlessdev/reventless-core/src/util/Util_Pulumi.res.mjs";
 import * as ApiSchemaPush$ReventlessAws from "./adapter/Api/ApiSchemaPush.res.mjs";
-import * as Util_DynamoDb$ReventlessAws from "./util/Util_DynamoDb.res.mjs";
 import * as Platform_Casts$ReventlessAws from "./Platform_Casts.res.mjs";
 import * as Platform_Stack$ReventlessAws from "./Platform_Stack.res.mjs";
 import * as QueryDbBackend$ReventlessAws from "./adapter/QueryDb/QueryDbBackend.res.mjs";
@@ -42,11 +38,11 @@ import * as EventLogBackend$ReventlessAws from "./adapter/EventLog/EventLogBacke
 import * as Platform_Admin$ReventlessCore from "@reventlessdev/reventless-core/src/admin/Platform_Admin.res.mjs";
 import * as PluginBehavior$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/lifecycle/PluginBehavior.res.mjs";
 import * as Plugin_Helpers$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/component/Plugin_Helpers.res.mjs";
-import * as DynamoDb_DocumentClient$AwsSdk from "@reventlessdev/rescript-aws-sdk/src/DynamoDb_DocumentClient.res.mjs";
 import * as PgProjectionFeed$ReventlessAws from "./adapter/Postgres/PgProjectionFeed.res.mjs";
 import * as Util_LocalConfig$ReventlessAws from "./util/Util_LocalConfig.res.mjs";
 import * as IndexJs from "@pulumi/pulumi/runtime/index.js";
 import * as AppSync_EventsApi$ReventlessAws from "./adapter/Api/AppSync_EventsApi.res.mjs";
+import * as AppSync_MergedApi$ReventlessAws from "./components/Api/AppSync_MergedApi.res.mjs";
 import * as GraphQL_Stitcher$ReventlessCore from "@reventlessdev/reventless-core/src/components/Api/GraphQL_Stitcher.res.mjs";
 import * as NoEventMappings$ReventlessInfra from "@reventlessdev/reventless-infra/src/types/NoEventMappings.res.mjs";
 import * as Util_HostUiDomain$ReventlessAws from "./util/Util_HostUiDomain.res.mjs";
@@ -54,6 +50,7 @@ import * as DcbEventLogStorage$ReventlessAws from "./adapter/DcbEventLog/DcbEven
 import * as ExtensionMapping$ReventlessInfra from "@reventlessdev/reventless-infra/src/types/ExtensionMapping.res.mjs";
 import * as PluginsProjection$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/lifecycle/PluginsProjection.res.mjs";
 import * as StateTopic_AppSync$ReventlessAws from "./adapter/StateTopic/StateTopic_AppSync.res.mjs";
+import * as AppSync_SdlDecorate$ReventlessAws from "./components/Api/AppSync_SdlDecorate.res.mjs";
 import * as UiFragmentRegistry$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UiFragmentRegistry/StateChangeSlice/UiFragmentRegistry.res.mjs";
 import * as Util_AppSync_Caller$ReventlessAws from "./util/Util_AppSync_Caller.res.mjs";
 import * as Util_ResourceNaming$ReventlessAws from "./util/Util_ResourceNaming.res.mjs";
@@ -111,12 +108,6 @@ import * as SideEffectHandlerRuntime_Builder_Single$ReventlessAws from "./adapte
 
 let log = Logger$ReventlessCore.fromEnv();
 
-let n = Stdlib_Option.flatMap(process.env["DEPLOY_SCHEMA_SHRINK_THRESHOLD"], Stdlib_Float.fromString);
-
-let deploySchemaShrinkThreshold = n !== undefined ? (
-    n > 0 && n < 1 ? n : 0.5
-  ) : 0.5;
-
 let apiConfigRef = {
   contents: undefined
 };
@@ -160,6 +151,7 @@ function MakeWithConfig(Config) {
     QueryDbBackend$ReventlessAws.exempt(UiFragments$ReventlessCore.name);
     QueryDbBackend$ReventlessAws.exempt(ApiFragmentsReadModelSpec$ReventlessCore.name);
   });
+  let mergedApiMode = Config.mergedApi;
   let currentDeployTarget = {
     contents: "Domain"
   };
@@ -181,6 +173,17 @@ function MakeWithConfig(Config) {
       id: Pulumi.output(roleName)
     };
   };
+  let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
+    types: [],
+    mutations: [],
+    queries: [],
+    subscriptions: [],
+    subscriptionSources: []
+  });
+  let adminSourceSdl = () => {
+    let baseFragment = AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(Config.cloner), "Admin", AdminApi$ReventlessCore.systemCallerFieldNames);
+    return AppSync_SdlDecorate$ReventlessAws.stampCanonicalTypes(AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(baseFragment, []));
+  };
   let match;
   if (platformStackRef !== undefined) {
     let stackRef = Primitive_option.valFromOption(platformStackRef);
@@ -229,21 +232,56 @@ function MakeWithConfig(Config) {
       let getFromDefault = key => Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap($$default, d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v));
       return makePhantomRole(Stdlib_Option.getOrThrow(Stdlib_Option.orElse(param[0], getFromDefault("platformApiRoleArn")), undefined));
     });
-    match = [
-      phantomApi,
-      phantomRole,
-      phantomPlatformApi,
-      phantomPlatformRole
-    ];
+    if (mergedApiMode) {
+      let cognitoPoolIdOutput = stackRef.getOutput("cognitoUserPoolId");
+      let cognitoRegionOutput = stackRef.getOutput("cognitoRegion");
+      let userPoolConfig = Pulumi.all([
+        cognitoPoolIdOutput,
+        cognitoRegionOutput,
+        defaultOutput
+      ]).apply(param => {
+        let $$default = param[2];
+        let getFromDefault = key => Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap($$default, d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v));
+        let userPoolId = Stdlib_Option.getOrThrow(Stdlib_Option.orElse(param[0], getFromDefault("cognitoUserPoolId")), "Platform stack does not export 'cognitoUserPoolId' — redeploy the platform stack first");
+        let awsRegion = Stdlib_Option.orElse(param[1], getFromDefault("cognitoRegion"));
+        return {
+          userPoolId: userPoolId,
+          defaultAction: "ALLOW",
+          awsRegion: awsRegion
+        };
+      });
+      let match$1 = AppSync_Adapter$ReventlessAws.makePluginSourceApiResource("PluginSourceApi", userPoolConfig, {});
+      let role = match$1[1];
+      let api = match$1[0];
+      match = [
+        api,
+        role,
+        api,
+        role
+      ];
+    } else {
+      match = [
+        phantomApi,
+        phantomRole,
+        phantomPlatformApi,
+        phantomPlatformRole
+      ];
+    }
   } else {
-    let match$1 = AppSync_Adapter$ReventlessAws.makeApiResource("DomainApi", {});
-    let role = match$1[1];
-    let api = match$1[0];
+    let match$2;
+    if (mergedApiMode) {
+      let schema = Config.splitApi ? AppSync_SdlDecorate$ReventlessAws.stampCanonicalTypes(AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(emptyBaseFragment, [])) : adminSourceSdl();
+      match$2 = AppSync_Adapter$ReventlessAws.makeSourceApiResource("DomainApi", schema, {});
+    } else {
+      match$2 = AppSync_Adapter$ReventlessAws.makeApiResource("DomainApi", {});
+    }
+    let role$1 = match$2[1];
+    let api$1 = match$2[0];
     match = [
-      api,
-      role,
-      api,
-      role
+      api$1,
+      role$1,
+      api$1,
+      role$1
     ];
   }
   let domainApiRole = match[1];
@@ -275,7 +313,7 @@ function MakeWithConfig(Config) {
       http: dnsHttp
     }));
     let api_name = Pulumi.output("");
-    let api$1 = {
+    let api$2 = {
       apiId: api_apiId,
       apiArn: api_apiArn,
       dns: api_dns,
@@ -283,7 +321,7 @@ function MakeWithConfig(Config) {
     };
     domainEventsApiOpt = {
       name: "DomainEventsApi",
-      api: api$1,
+      api: api$2,
       defaultNamespace: undefined
     };
   } else {
@@ -463,13 +501,6 @@ function MakeWithConfig(Config) {
     project: UiFragments_Projection$ReventlessCore.project,
     moduleUrl: UiFragments_Projection$ReventlessCore.moduleUrl
   });
-  let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
-    types: [],
-    mutations: [],
-    queries: [],
-    subscriptions: [],
-    subscriptionSources: []
-  });
   let Make$8 = FragmentConfig => {
     let Builder = Api_Builder$ReventlessCore.Make({
       makeApiResource: AppSync_Adapter$ReventlessAws.makeApiResource,
@@ -485,38 +516,6 @@ function MakeWithConfig(Config) {
   let Api = {
     Make: Make$8
   };
-  let deploySchemaHashPrefix = "deploy-schema-hash:";
-  let readSchemaHash = async (tableName, apiId) => {
-    let key = Object.fromEntries([[
-        "id",
-        deploySchemaHashPrefix + apiId
-      ]]);
-    try {
-      let result = await DynamoDb_DocumentClient$AwsSdk.GetCommand.send(new LibDynamodb.GetCommand({
-        TableName: tableName,
-        Key: key
-      }));
-      return Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(result.Item, item => Stdlib_JSON.Decode.object(item)), d => d["hash"]), v => Stdlib_JSON.Decode.string(v));
-    } catch (exn) {
-      return;
-    }
-  };
-  let writeSchemaHash = async (tableName, apiId, hash) => {
-    let item = Object.fromEntries([
-      [
-        "id",
-        deploySchemaHashPrefix + apiId
-      ],
-      [
-        "hash",
-        hash
-      ]
-    ]);
-    await DynamoDb_DocumentClient$AwsSdk.PutCommand.send(new LibDynamodb.PutCommand({
-      Item: item,
-      TableName: tableName
-    }));
-  };
   let hooksApiRef = {
     contents: undefined
   };
@@ -526,6 +525,9 @@ function MakeWithConfig(Config) {
   let hooksAdminApiRef = {
     contents: undefined
   };
+  let mergedSchemaPushedRef = {
+    contents: undefined
+  };
   let resolveHookedApi = () => {
     let match = hooksApiRef.contents;
     if (match !== undefined) {
@@ -589,231 +591,76 @@ function MakeWithConfig(Config) {
     StateTopic_AppSync$ReventlessAws.finish(eventsApi, {});
   }));
   let hooks_preResolversSchemaHook = (name, version, pluginFragment) => {
+    if (mergedApiMode) {
+      let sdl = AppSync_Adapter$ReventlessAws.stitchStandaloneWithAwsDirectives(pluginFragment);
+      let pushed = Output$Pulumi.flatMap(domainApi, api => Output$Pulumi.flatMap(api.id, apiId => {
+        log.info("preResolversSchemaHook", undefined, `Pushing subgraph schema for ` + name + `@` + version + ` to source API ` + apiId);
+        let client = AppSync_Adapter$ReventlessAws.getClient();
+        return AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(client, {
+          apiId: apiId,
+          definition: sdl
+        }).then(async () => {
+          await AppSync_Adapter$ReventlessAws.waitForSchemaActive(client, apiId, undefined, undefined);
+          return log.info("preResolversSchemaHook", undefined, "subgraph schema is ACTIVE");
+        });
+      }));
+      mergedSchemaPushedRef.contents = pushed;
+      return pushed;
+    }
     log.info("preResolversSchemaHook", undefined, `Pushing schema for plugin ` + name + `@` + version + ` to AppSync`);
     let capturedDeployTarget = currentDeployTarget.contents;
-    if (platformStackRef !== undefined) {
-      let apiTargetName;
-      apiTargetName = capturedDeployTarget === "Domain" ? "Domain" : "Platform";
-      let match = apiConfigRef.contents;
-      let platformApi = match !== undefined ? match.platformApi : domainApi;
-      let region = Stdlib_Option.getOr(new Pulumi.Config("aws").get("region"), "unknown");
-      let endpointOutput = Output$Pulumi.flatMap(platformApi, api => api.uris).apply(uris => uris.GRAPHQL);
-      ApiFragmentDeregistration$ReventlessAws.make(name + `ApiFragmentRegistration`, name, endpointOutput, region, undefined);
-      return Output$Pulumi.flatMap(endpointOutput, endpoint => {
-        let run = async () => {
-          let at = new Date().toISOString();
-          let variables = {
-            id: "registry",
-            pluginId: name,
-            fragment: {
-              encoded: pluginFragment.encoded,
-              protocol: pluginFragment.protocol
-            },
-            apiTarget: Util_AppSync_Caller$ReventlessAws.graphqlEnum(apiTargetName),
-            at: at
-          };
-          log.info("registerFragmentViaApi", undefined, `Registering API fragment for ` + name + ` (` + apiTargetName + `) via ` + endpoint);
-          let result = await Util_AppSync_Caller$ReventlessAws.sendMutation(endpoint, region, "Platform_ApiFragmentRegistry_RegisterApiFragment", "{ __typename ... on CommandAccepted { eventCount } ... on CommandRejected { errorCode errorDetail } }", variables);
-          let outcome = Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(result, Stdlib_JSON.Decode.object), d => d["Platform_ApiFragmentRegistry_RegisterApiFragment"]), Stdlib_JSON.Decode.object);
-          if (outcome === undefined) {
-            return await waitForApiFragmentPush(endpoint, region, name, at);
-          }
-          let typename = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["__typename"], Stdlib_JSON.Decode.string), "");
-          switch (typename) {
-            case "CommandAccepted" :
-              let eventCount = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["eventCount"], Stdlib_JSON.Decode.float), 0.0);
-              if (eventCount > 0.0) {
-                return await waitForApiFragmentPush(endpoint, region, name, at);
-              } else {
-                return log.info("registerFragmentViaApi", undefined, name + ` fragment unchanged — no push needed`);
-              }
-            case "CommandRejected" :
-              let code = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["errorCode"], Stdlib_JSON.Decode.string), "unknown");
-              return Stdlib_JsError.throwWithMessage(`RegisterApiFragment rejected for ` + name + `: ` + code);
-            default:
-              return await waitForApiFragmentPush(endpoint, region, name, at);
-          }
+    if (platformStackRef === undefined) {
+      return Pervasives.failwith("makePlatform(~plugins=[…]) is no longer supported on AWS — deploy the platform with deployPlatform and each plugin with deployPlugin (staged register + reactive push).");
+    }
+    let apiTargetName;
+    apiTargetName = capturedDeployTarget === "Domain" ? "Domain" : "Platform";
+    let match = apiConfigRef.contents;
+    let platformApi = match !== undefined ? match.platformApi : domainApi;
+    let region = Stdlib_Option.getOr(new Pulumi.Config("aws").get("region"), "unknown");
+    let endpointOutput = Output$Pulumi.flatMap(platformApi, api => api.uris).apply(uris => uris.GRAPHQL);
+    ApiFragmentDeregistration$ReventlessAws.make(name + `ApiFragmentRegistration`, name, endpointOutput, region, undefined);
+    return Output$Pulumi.flatMap(endpointOutput, endpoint => {
+      let run = async () => {
+        let at = new Date().toISOString();
+        let variables = {
+          id: "registry",
+          pluginId: name,
+          fragment: {
+            encoded: pluginFragment.encoded,
+            protocol: pluginFragment.protocol
+          },
+          apiTarget: Util_AppSync_Caller$ReventlessAws.graphqlEnum(apiTargetName),
+          at: at
         };
-        return run();
-      });
-    }
-    let match$1;
-    if (capturedDeployTarget === "Domain") {
-      match$1 = [
-        "deploy-schema:",
-        domainApi
-      ];
-    } else {
-      let match$2 = apiConfigRef.contents;
-      let api = match$2 !== undefined ? match$2.platformApi : domainApi;
-      match$1 = [
-        "deploy-schema-platform:",
-        api
-      ];
-    }
-    let targetApi = match$1[1];
-    let schemaPrefix = match$1[0];
-    let readStackRefString = (stackRef, key) => {
-      let direct = stackRef.getOutput(key);
-      let defaultOutput = stackRef.getOutput("default");
-      return Pulumi.all([
-        direct,
-        defaultOutput
-      ]).apply(param => {
-        let name = Stdlib_Option.flatMap(param[0], v => Stdlib_JSON.Decode.string(v));
-        if (name !== undefined) {
-          return name;
-        } else {
-          return Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(param[1], d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v));
+        log.info("registerFragmentViaApi", undefined, `Registering API fragment for ` + name + ` (` + apiTargetName + `) via ` + endpoint);
+        let result = await Util_AppSync_Caller$ReventlessAws.sendMutation(endpoint, region, "Platform_ApiFragmentRegistry_RegisterApiFragment", "{ __typename ... on CommandAccepted { eventCount } ... on CommandRejected { errorCode errorDetail } }", variables);
+        let outcome = Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(result, Stdlib_JSON.Decode.object), d => d["Platform_ApiFragmentRegistry_RegisterApiFragment"]), Stdlib_JSON.Decode.object);
+        if (outcome === undefined) {
+          return await waitForApiFragmentPush(endpoint, region, name, at);
         }
-      });
-    };
-    let schemaPersistenceTableNameOutput;
-    if (platformStackRef !== undefined) {
-      let stackRef = Primitive_option.valFromOption(platformStackRef);
-      schemaPersistenceTableNameOutput = Pulumi.all([
-        readStackRefString(stackRef, "pluginSchemaPersistenceTableName"),
-        readStackRefString(stackRef, "pluginRmTableName")
-      ]).apply(param => {
-        let dedicated = param[0];
-        if (dedicated !== undefined) {
-          return dedicated;
-        } else {
-          return param[1];
-        }
-      });
-    } else {
-      schemaPersistenceTableNameOutput = Pulumi.output(undefined);
-    }
-    return Output$Pulumi.flatMap(schemaPersistenceTableNameOutput, tableNameOpt => {
-      let writeAndScanFragments = () => {
-        if (tableNameOpt !== undefined) {
-          let deployItem = Object.fromEntries([
-            [
-              "id",
-              schemaPrefix + name
-            ],
-            [
-              "fragment",
-              pluginFragment.encoded
-            ]
-          ]);
-          log.info("preResolversSchemaHook", undefined, `Writing deploy-schema entry for ` + name + ` to ` + tableNameOpt);
-          let scanAllDeploySchemaItems = async () => {
-            let allItems = [];
-            let startKey;
-            let more = true;
-            while (more) {
-              let result = await DynamoDb_DocumentClient$AwsSdk.ScanCommand.send(new LibDynamodb.ScanCommand({
-                TableName: tableNameOpt,
-                ExclusiveStartKey: startKey,
-                ExpressionAttributeNames: Object.fromEntries([[
-                    "#id",
-                    "id"
-                  ]]),
-                ExpressionAttributeValues: Object.fromEntries([[
-                    ":prefix",
-                    schemaPrefix
-                  ]]),
-                FilterExpression: "begins_with(#id, :prefix)"
-              }));
-              Stdlib_Option.getOr(result.Items, []).forEach(item => {
-                allItems.push(item);
-              });
-              let k = result.LastEvaluatedKey;
-              if (k !== undefined) {
-                startKey = k;
-              } else {
-                more = false;
-              }
-            };
-            return allItems;
-          };
-          return Stdlib_Promise.$$catch(DynamoDb_DocumentClient$AwsSdk.PutCommand.send(new LibDynamodb.PutCommand({
-            Item: deployItem,
-            TableName: tableNameOpt
-          })).then(param => {
-            log.info("preResolversSchemaHook", undefined, `Scanning ` + tableNameOpt + ` for deploy-schema entries`);
-            return scanAllDeploySchemaItems();
-          }).then(items => {
-            let fragments = Stdlib_Array.filterMap(items, item => {
-              try {
-                let obj = JSON.parse(JSON.stringify(item));
-                let fragmentJson = Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(obj), d => d["fragment"]);
-                if (fragmentJson === undefined) {
-                  return;
-                }
-                let encoded = Stdlib_JSON.Decode.string(fragmentJson);
-                if (encoded !== undefined) {
-                  return {
-                    encoded: encoded,
-                    protocol: "graphql"
-                  };
-                } else {
-                  return;
-                }
-              } catch (exn) {
-                return;
-              }
-            });
-            log.info("preResolversSchemaHook", undefined, `Found ` + fragments.length.toString() + ` deploy-schema entries`);
-            return Promise.resolve(fragments);
-          }), err => {
-            let msg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
-            log.info("preResolversSchemaHook", undefined, `DynamoDB write/scan failed (` + msg + `) — using current plugin only`);
-            return Promise.resolve([pluginFragment]);
-          });
-        }
-        log.info("preResolversSchemaHook", undefined, "No pluginSchemaPersistenceTableName / pluginRmTableName — skipping fragment persistence");
-        return Promise.resolve([pluginFragment]);
-      };
-      return Output$Pulumi.flatMap(targetApi, api => Output$Pulumi.flatMap(api.id, apiId => {
-        let runSchemaPush = () => writeAndScanFragments().then(async allPluginFragments => {
-          let baseFragment;
-          baseFragment = capturedDeployTarget === "Domain" ? (
-              Config.splitApi ? emptyBaseFragment : AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(Config.cloner), "Admin", undefined)
-            ) : AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(Config.cloner), "Admin", AdminApi$ReventlessCore.systemCallerFieldNames);
-          let sdl = AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(baseFragment, allPluginFragments);
-          let currentHash = AppSync_Adapter$ReventlessAws.sha256Hex(sdl);
-          let storedHash = tableNameOpt !== undefined ? await readSchemaHash(tableNameOpt, apiId) : undefined;
-          let client = AppSync_Adapter$ReventlessAws.getClient();
-          let liveSdl = await AppSync_Adapter$ReventlessAws.getIntrospectionSdl(client, apiId);
-          let countRoots = s => (GraphQL_Stitcher$ReventlessCore.countRootTypeFields(s, "Mutation") + GraphQL_Stitcher$ReventlessCore.countRootTypeFields(s, "Query") | 0) + GraphQL_Stitcher$ReventlessCore.countRootTypeFields(s, "Subscription") | 0;
-          let missingFields = GraphQL_Stitcher$ReventlessCore.missingRootFields(sdl, liveSdl);
-          let skipPush = storedHash !== undefined && storedHash === currentHash ? (
-              liveSdl === "" ? (log.info("preResolversSchemaHook", undefined, `hash matches but live schema could not be introspected — forcing repair push (check appsync:GetIntrospectionSchema permission)`), false) : (
-                  missingFields.length !== 0 ? (log.info("preResolversSchemaHook", undefined, `hash matches but live schema is missing ` + missingFields.length.toString() + ` expected root field(s) (e.g. ` + missingFields.slice(0, 5).join(", ") + `) — forcing repair push`), false) : (log.info("preResolversSchemaHook", undefined, `SDL unchanged (hash ` + currentHash.slice(0, 12) + `…) and live schema is a superset of the expected root fields (` + countRoots(liveSdl).toString() + ` live); skipping push`), true)
-                )
-            ) : false;
-          if (!skipPush) {
-            if (GraphQL_Stitcher$ReventlessCore.isCatastrophicSchemaShrink(liveSdl, sdl, deploySchemaShrinkThreshold)) {
-              return log.error("preResolversSchemaHook", undefined, `ABORTED schema push for ` + apiId + `: stitched SDL (` + countRoots(sdl).toString() + ` root field(s)) would catastrophically shrink the live schema (` + countRoots(liveSdl).toString() + ` root field(s), threshold ` + deploySchemaShrinkThreshold.toString() + `) — refusing to clobber resolvers (likely a stale concurrent-deploy scan)`);
+        let typename = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["__typename"], Stdlib_JSON.Decode.string), "");
+        switch (typename) {
+          case "CommandAccepted" :
+            let eventCount = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["eventCount"], Stdlib_JSON.Decode.float), 0.0);
+            if (eventCount > 0.0) {
+              return await waitForApiFragmentPush(endpoint, region, name, at);
             } else {
-              log.info("preResolversSchemaHook", undefined, `Pushing schema to API ` + apiId + ` (` + allPluginFragments.length.toString() + ` plugin fragments, new hash: ` + currentHash.slice(0, 12) + `…)`);
-              await AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(client, {
-                apiId: apiId,
-                definition: sdl
-              });
-              log.info("preResolversSchemaHook", undefined, "startSchemaCreation called, waiting for ACTIVE");
-              await AppSync_Adapter$ReventlessAws.waitForSchemaActive(client, apiId, undefined, undefined);
-              log.info("preResolversSchemaHook", undefined, "Schema is ACTIVE");
-              if (tableNameOpt !== undefined) {
-                return await writeSchemaHash(tableNameOpt, apiId, currentHash);
-              } else {
-                return;
-              }
+              return log.info("registerFragmentViaApi", undefined, name + ` fragment unchanged — no push needed`);
             }
-          }
-        });
-        if (tableNameOpt !== undefined) {
-          return AppSync_Adapter$ReventlessAws.withSchemaPushLock(tableNameOpt, apiId, undefined, undefined, runSchemaPush);
-        } else {
-          return runSchemaPush();
+          case "CommandRejected" :
+            let code = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["errorCode"], Stdlib_JSON.Decode.string), "unknown");
+            return Stdlib_JsError.throwWithMessage(`RegisterApiFragment rejected for ` + name + `: ` + code);
+          default:
+            return await waitForApiFragmentPush(endpoint, region, name, at);
         }
-      }));
+      };
+      return run();
     });
   };
   let hooks_preAdminResolversSchemaHook = adminBarrier => {
+    if (mergedApiMode) {
+      return adminBarrier;
+    }
     let match = splitApiOutputsRef.contents;
     let targetApiOpt = match !== undefined ? match.platformApi : (
         Config.splitApi ? undefined : domainApi
@@ -1100,6 +947,9 @@ function MakeWithConfig(Config) {
   };
   let makePlatform = (version, plugins) => {
     log.info("Platform", undefined, `v` + version);
+    if (mergedApiMode) {
+      Pervasives.failwith("mergedApi mode is supported with deployPlatform only — deploy the platform with deployPlatform and each plugin with deployPlugin.");
+    }
     let scheduler = makeScheduler();
     hooks_scheduler.contents = scheduler;
     hooksApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(domainApi);
@@ -1184,12 +1034,41 @@ function MakeWithConfig(Config) {
     hooks_scheduler.contents = scheduler;
     hooksApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(domainApi);
     hooksApiRoleRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(domainApiRole);
-    let match = Config.splitApi ? AppSync_Adapter$ReventlessAws.makeApiResource("PlatformApi", {}) : [
+    let match = Config.splitApi ? (
+        mergedApiMode ? AppSync_Adapter$ReventlessAws.makeSourceApiResource("PlatformApi", adminSourceSdl(), {}) : AppSync_Adapter$ReventlessAws.makeApiResource("PlatformApi", {})
+      ) : [
         domainApi,
         domainApiRole
       ];
     let platformApiRole = match[1];
     let platformApi = match[0];
+    let mergedOutputs;
+    if (mergedApiMode) {
+      AppSync_MergedApi$ReventlessAws.assertCompatiblePrimaryAuth(AppSync_MergedApi$ReventlessAws.authenticationTypeName(AppSync_Adapter$ReventlessAws.primaryAuthenticationType), AppSync_MergedApi$ReventlessAws.primaryAuthMode);
+      let domainMerged = AppSync_MergedApi$ReventlessAws.make("DomainMergedApi", {});
+      if (Config.splitApi) {
+        let platformMerged = AppSync_MergedApi$ReventlessAws.make("PlatformMergedApi", {});
+        let platformAssoc = AppSync_MergedApi$ReventlessAws.associateSource("PlatformAdminSourceAssociation", platformMerged, platformApi, {});
+        let domainAssoc = AppSync_MergedApi$ReventlessAws.associateSource("DomainBaseSourceAssociation", domainMerged, domainApi, {});
+        mergedOutputs = {
+          domainMerged: domainMerged,
+          platformMerged: platformMerged,
+          domainMergeGate: AppSync_MergedApi$ReventlessAws.mergeStatusGate(domainMerged, domainAssoc),
+          platformMergeGate: AppSync_MergedApi$ReventlessAws.mergeStatusGate(platformMerged, platformAssoc)
+        };
+      } else {
+        let assoc = AppSync_MergedApi$ReventlessAws.associateSource("DomainAdminSourceAssociation", domainMerged, domainApi, {});
+        let gate = AppSync_MergedApi$ReventlessAws.mergeStatusGate(domainMerged, assoc);
+        mergedOutputs = {
+          domainMerged: domainMerged,
+          platformMerged: domainMerged,
+          domainMergeGate: gate,
+          platformMergeGate: gate
+        };
+      }
+    } else {
+      mergedOutputs = undefined;
+    }
     hooksAdminApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(platformApi);
     if (Config.splitApi) {
       splitApiOutputsRef.contents = {
@@ -1207,38 +1086,8 @@ function MakeWithConfig(Config) {
       }
     }
     let domainApiId = Output$Pulumi.flatMap(domainApi, api => api.id);
-    let updateApiSchema = async queryEngine => {
-      let apiId = domainApiId.get();
-      let plugins = await queryEngine.scan("Plugins", [[
-          "status",
-          "Contains",
-          {
-            TAG: "String",
-            _0: "Connected"
-          }
-        ]], 1000);
-      let fragments = Stdlib_Array.filterMap(plugins, json => {
-        try {
-          let state = S.parseOrThrow(json, PluginsReadModelSpec$ReventlessCore.stateSchema);
-          let match = state.apiTarget;
-          if (match === "Platform") {
-            return;
-          } else {
-            return state.apiSchemaFragment;
-          }
-        } catch (exn) {
-          return;
-        }
-      });
-      let baseFragment = Config.splitApi ? emptyBaseFragment : AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(Config.cloner), "Admin", AdminApi$ReventlessCore.systemCallerFieldNames);
-      let sdl = AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(baseFragment, fragments);
-      return await AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(AppSync_Adapter$ReventlessAws.getClient(), {
-        apiId: apiId,
-        definition: sdl
-      });
-    };
     let PluginExtensionPoint = Plugin_ExtensionPoint_Builder$ReventlessAws.MakeWithConfig({
-      updateApiSchema: updateApiSchema,
+      updateApiSchema: undefined,
       manageSubscriptions: undefined
     });
     let admin = Admin.construct(version, [PluginExtensionPoint], [
@@ -1250,14 +1099,15 @@ function MakeWithConfig(Config) {
     ], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     let apiSchemaPushEventTopics = Aggregate$ReventlessCore.allEventTopics(admin.aggregatesOutputs);
     let apiSchemaPushCmdTopics = Aggregate$ReventlessCore.allCommandTopics(admin.aggregatesOutputs);
-    let apiSchemaPushCmdTopicUrl = Stdlib_Option.getOr(Stdlib_Option.map(admin.aggregatesOutputs[ApiFragmentRegistrySpec$ReventlessCore.name], agg => Output$Pulumi.flatMap(agg.commandTopic, ct => {
-      let r = ct.resources[0];
-      if (r !== undefined) {
-        return r.id;
-      } else {
-        return Pulumi.output("");
-      }
-    })), Pulumi.output(""));
+    let agg = admin.aggregatesOutputs[ApiFragmentRegistrySpec$ReventlessCore.name];
+    let apiSchemaPushCmdTopicUrl = agg !== undefined ? Output$Pulumi.flatMap(agg.commandTopic, ct => {
+        let r = ct.resources[0];
+        if (r !== undefined) {
+          return r.id;
+        } else {
+          return Pulumi.output("");
+        }
+      }) : Pulumi.output("");
     let apiSchemaPushEnv = Object.fromEntries([
       [
         "API_SCHEMA_PUSH_DOMAIN_API_ID",
@@ -1304,10 +1154,6 @@ function MakeWithConfig(Config) {
     } else {
       pluginReadModelTableName = undefined;
     }
-    let pluginSchemaPersistenceTable = Util_DynamoDb$ReventlessAws.makeTable([{
-        name: "id",
-        type: "S"
-      }], undefined, undefined, undefined, undefined, {}, "PluginSchemaPersistence");
     PluginExtensionPointRuntime_Builder$ReventlessAws.registerPluginExtensionPoint(pluginReadModelTableName, hooks_schedulerRoleUrn.contents, undefined);
     let pluginEpEventTopicArn = Output$Pulumi.flatMap(admin.extensionPointsOutputs, eps => {
       let ep = eps.find(ep => ep.name === PluginExtensionPointSpec$ReventlessInfra.name);
@@ -1324,24 +1170,23 @@ function MakeWithConfig(Config) {
         return Pulumi.output("NOT_AVAILABLE");
       }
     });
-    let r$1 = Stdlib_Option.flatMap(admin.readModelsOutputs["ApiFragments"], rm => rm.queryDb.resources[0]);
-    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, pluginSchemaPersistenceTable.name, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, Config.cloner, Output$Pulumi.flatMap(platformApi, api => api.id), r$1 !== undefined ? r$1.name : undefined, AutomationSliceRuntime_Builder_Single$ReventlessAws.getDcbQueueUrl(), Config.splitApi, undefined);
+    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, Config.cloner, undefined);
     if (pluginReadModelTableName !== undefined) {
       AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(pluginReadModelTableName);
       Platform_ComponentDefinitions_Lambda$ReventlessAws.make(platformApi, pluginReadModelTableName, {});
     }
     let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
-      let r$2 = rm.queryDb.resources[0];
-      if (r$2 !== undefined) {
-        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$2.name, admin.adminSchemaPushed, {});
+      let r$1 = rm.queryDb.resources[0];
+      if (r$1 !== undefined) {
+        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, admin.adminSchemaPushed, {});
       }
     }
     let rm$1 = admin.readModelsOutputs["ApiFragments"];
     if (rm$1 !== undefined) {
-      let r$3 = rm$1.queryDb.resources[0];
-      if (r$3 !== undefined) {
-        Platform_ApiFragments_Lambda$ReventlessAws.make(platformApi, r$3.name, admin.adminSchemaPushed, {});
+      let r$2 = rm$1.queryDb.resources[0];
+      if (r$2 !== undefined) {
+        Platform_ApiFragments_Lambda$ReventlessAws.make(platformApi, r$2.name, admin.adminSchemaPushed, {});
       }
     }
     if (Config.splitApi) {
@@ -1356,6 +1201,22 @@ function MakeWithConfig(Config) {
     Pulumi$Pulumi.$$export("domainApiId", Output$Pulumi.flatMap(domainApi, api => api.id));
     Pulumi$Pulumi.$$export("domainApiEndpoint", Output$Pulumi.flatMap(domainApi, api => api.uris.apply(uris => uris.GRAPHQL)));
     Pulumi$Pulumi.$$export("domainApiRoleArn", Output$Pulumi.flatMap(domainApiRole, role => role.arn));
+    if (mergedOutputs !== undefined) {
+      let platformMerged$1 = mergedOutputs.platformMerged;
+      let domainMerged$1 = mergedOutputs.domainMerged;
+      let mergeGatedArn = (merged, gate) => Pulumi.all([
+        Output$Pulumi.flatMap(merged.api, api => api.arn),
+        gate
+      ]).apply(param => param[0]);
+      let mergedEndpoint = merged => Output$Pulumi.flatMap(merged.api, api => api.uris.apply(uris => uris.GRAPHQL));
+      Pulumi$Pulumi.$$export("domainMergedApiArn", mergeGatedArn(domainMerged$1, mergedOutputs.domainMergeGate));
+      Pulumi$Pulumi.$$export("domainMergedApiId", Output$Pulumi.flatMap(domainMerged$1.api, api => api.id));
+      Pulumi$Pulumi.$$export("domainMergedApiEndpoint", mergedEndpoint(domainMerged$1));
+      Pulumi$Pulumi.$$export("platformMergedApiArn", mergeGatedArn(platformMerged$1, mergedOutputs.platformMergeGate));
+      Pulumi$Pulumi.$$export("platformMergedApiId", Output$Pulumi.flatMap(platformMerged$1.api, api => api.id));
+      Pulumi$Pulumi.$$export("platformMergedApiEndpoint", mergedEndpoint(platformMerged$1));
+      Pulumi$Pulumi.$$export("mergedApiPrimaryAuth", Pulumi.output(AppSync_MergedApi$ReventlessAws.primaryAuthMode));
+    }
     if (domainEventsApiOpt !== undefined) {
       Pulumi$Pulumi.$$export("eventsApiArn", domainEventsApiOpt.api.apiArn);
       Pulumi$Pulumi.$$export("eventsApiDns", domainEventsApiOpt.api.dns.apply(dns => Stdlib_Option.getOr(dns.http, "")));
@@ -1363,11 +1224,12 @@ function MakeWithConfig(Config) {
     if (pluginReadModelTableName !== undefined) {
       Pulumi$Pulumi.$$export("pluginRmTableName", pluginReadModelTableName);
     }
-    Pulumi$Pulumi.$$export("pluginSchemaPersistenceTableName", pluginSchemaPersistenceTable.name);
     Plugin_Helpers$ReventlessCore.exportPlatformOutputs(admin.extensionPointsOutputs, admin.aggregatesOutputs, admin.readModelsOutputs, admin.dcbEventLogOutputs, admin.stateChangeSlicesOutputs, admin.stateViewSlicesOutputs, admin.automationSlicesOutputs, admin.outboundTranslationSlicesOutputs, admin.inboundTranslationSlicesOutputs);
-    let resolvedDomainApiEndpoint = Output$Pulumi.flatMap(domainApi, api => api.uris.apply(uris => uris.GRAPHQL));
+    let clientDomainApi = mergedOutputs !== undefined ? mergedOutputs.domainMerged.api : domainApi;
+    let clientPlatformApi = mergedOutputs !== undefined ? mergedOutputs.platformMerged.api : platformApi;
+    let resolvedDomainApiEndpoint = Output$Pulumi.flatMap(clientDomainApi, api => api.uris.apply(uris => uris.GRAPHQL));
     let resolvedDomainApiRoleArn = Output$Pulumi.flatMap(domainApiRole, role => role.arn);
-    let resolvedPlatformApiEndpoint = Output$Pulumi.flatMap(platformApi, api => api.uris.apply(uris => uris.GRAPHQL));
+    let resolvedPlatformApiEndpoint = Output$Pulumi.flatMap(clientPlatformApi, api => api.uris.apply(uris => uris.GRAPHQL));
     let resolvedPlatformApiRoleArn = Output$Pulumi.flatMap(platformApiRole, role => role.arn);
     let adminResourcesOutput = Pulumi.all(Object.values(admin.aggregatesOutputs).map(agg => Aggregate$ReventlessCore.toResolvedOutputs(agg).apply(r => [
       r.eventLog.resources,
@@ -1498,6 +1360,47 @@ function MakeWithConfig(Config) {
     Pulumi$Pulumi.$$export("_interopMeta", Plugin_Helpers$ReventlessCore.getInteropMeta());
     let pluginOutputs = Component$ReventlessCore.outputs(pluginComponent);
     Plugin_Helpers$ReventlessCore.exportPluginOutputs(pluginOutputs);
+    if (mergedApiMode && platformStackRef !== undefined) {
+      let stackRef = Primitive_option.valFromOption(platformStackRef);
+      let defaultOutput = stackRef.getOutput("default");
+      let getMergedExport = key => {
+        let direct = stackRef.getOutput(key);
+        return Pulumi.all([
+          direct,
+          defaultOutput
+        ]).apply(param => {
+          let direct = param[0];
+          if (direct !== undefined) {
+            return direct;
+          } else {
+            return Stdlib_Option.getOrThrow(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(param[1], d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v)), `Platform stack does not export '` + key + `' — deploy the platform with mergedApi=true first`);
+          }
+        });
+      };
+      let mergedApiArn;
+      mergedApiArn = apiTarget === "Domain" ? getMergedExport("domainMergedApiArn") : getMergedExport("platformMergedApiArn");
+      let checkedMergedApiArn = Pulumi.all([
+        mergedApiArn,
+        getMergedExport("mergedApiPrimaryAuth")
+      ]).apply(param => {
+        AppSync_MergedApi$ReventlessAws.assertCompatiblePrimaryAuth(AppSync_MergedApi$ReventlessAws.authenticationTypeName(AppSync_Adapter$ReventlessAws.primaryAuthenticationType), param[1]);
+        return param[0];
+      });
+      let pushed = mergedSchemaPushedRef.contents;
+      let schemaPushed = pushed !== undefined ? pushed : Pulumi.output();
+      let arnAfterSchemaPush = Pulumi.all([
+        checkedMergedApiArn,
+        schemaPushed
+      ]).apply(param => param[0]);
+      let association = AppSync_MergedApi$ReventlessAws.associateSourceWithMergedArn("PluginSourceAssociation", arnAfterSchemaPush, domainApi, {});
+      let mergeGate = AppSync_MergedApi$ReventlessAws.mergeStatusGateWith(checkedMergedApiArn, association);
+      Pulumi$Pulumi.$$export("sourceApiAssociationId", Pulumi.all([
+        association.associationId,
+        mergeGate
+      ]).apply(param => param[0]));
+      Pulumi$Pulumi.$$export("pluginSourceApiId", Output$Pulumi.flatMap(domainApi, api => api.id));
+      Pulumi$Pulumi.$$export("pluginSourceApiEndpoint", Output$Pulumi.flatMap(domainApi, api => api.uris.apply(uris => uris.GRAPHQL)));
+    }
     provisionPgChangeFeedRelay();
     let sel = QueryDbBackend$ReventlessAws.get();
     if (sel !== undefined) {
@@ -1623,6 +1526,17 @@ function Make($star) {
       id: Pulumi.output(roleName)
     };
   };
+  let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
+    types: [],
+    mutations: [],
+    queries: [],
+    subscriptions: [],
+    subscriptionSources: []
+  });
+  let adminSourceSdl = () => {
+    let baseFragment = AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(false), "Admin", AdminApi$ReventlessCore.systemCallerFieldNames);
+    return AppSync_SdlDecorate$ReventlessAws.stampCanonicalTypes(AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(baseFragment, []));
+  };
   let match;
   if (platformStackRef !== undefined) {
     let stackRef = Primitive_option.valFromOption(platformStackRef);
@@ -1630,7 +1544,7 @@ function Make($star) {
     let domainApiIdOutput = stackRef.getOutput("domainApiId");
     let domainApiEndpointOutput = stackRef.getOutput("domainApiEndpoint");
     let domainApiRoleArnOutput = stackRef.getOutput("domainApiRoleArn");
-    let phantomApi = Pulumi.all([
+    Pulumi.all([
       domainApiIdOutput,
       domainApiEndpointOutput,
       defaultOutput
@@ -1642,7 +1556,7 @@ function Make($star) {
       let apiEndpoint = directEndpoint !== undefined ? directEndpoint : Stdlib_Option.getOrThrow(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap($$default, d => Stdlib_JSON.Decode.object(d)), d => d["domainApiEndpoint"]), v => Stdlib_JSON.Decode.string(v)), "Platform stack does not export 'domainApiEndpoint' — redeploy the platform stack first");
       return makePhantomApi(apiId, apiEndpoint);
     });
-    let phantomRole = Pulumi.all([
+    Pulumi.all([
       domainApiRoleArnOutput,
       defaultOutput
     ]).apply(param => {
@@ -1652,7 +1566,7 @@ function Make($star) {
     let platformApiIdOutput = stackRef.getOutput("platformApiId");
     let platformApiEndpointOutput = stackRef.getOutput("platformApiEndpoint");
     let platformApiRoleArnOutput = stackRef.getOutput("platformApiRoleArn");
-    let phantomPlatformApi = Pulumi.all([
+    Pulumi.all([
       platformApiIdOutput,
       platformApiEndpointOutput,
       defaultOutput
@@ -1663,7 +1577,7 @@ function Make($star) {
       let platformApiEndpoint = Stdlib_Option.getOrThrow(Stdlib_Option.orElse(param[1], getFromDefault("platformApiEndpoint")), undefined);
       return makePhantomApi(platformApiId, platformApiEndpoint);
     });
-    let phantomPlatformRole = Pulumi.all([
+    Pulumi.all([
       platformApiRoleArnOutput,
       defaultOutput
     ]).apply(param => {
@@ -1671,14 +1585,24 @@ function Make($star) {
       let getFromDefault = key => Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap($$default, d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v));
       return makePhantomRole(Stdlib_Option.getOrThrow(Stdlib_Option.orElse(param[0], getFromDefault("platformApiRoleArn")), undefined));
     });
-    match = [
-      phantomApi,
-      phantomRole,
-      phantomPlatformApi,
-      phantomPlatformRole
-    ];
-  } else {
-    let match$1 = AppSync_Adapter$ReventlessAws.makeApiResource("DomainApi", {});
+    let cognitoPoolIdOutput = stackRef.getOutput("cognitoUserPoolId");
+    let cognitoRegionOutput = stackRef.getOutput("cognitoRegion");
+    let userPoolConfig = Pulumi.all([
+      cognitoPoolIdOutput,
+      cognitoRegionOutput,
+      defaultOutput
+    ]).apply(param => {
+      let $$default = param[2];
+      let getFromDefault = key => Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap($$default, d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v));
+      let userPoolId = Stdlib_Option.getOrThrow(Stdlib_Option.orElse(param[0], getFromDefault("cognitoUserPoolId")), "Platform stack does not export 'cognitoUserPoolId' — redeploy the platform stack first");
+      let awsRegion = Stdlib_Option.orElse(param[1], getFromDefault("cognitoRegion"));
+      return {
+        userPoolId: userPoolId,
+        defaultAction: "ALLOW",
+        awsRegion: awsRegion
+      };
+    });
+    let match$1 = AppSync_Adapter$ReventlessAws.makePluginSourceApiResource("PluginSourceApi", userPoolConfig, {});
     let role = match$1[1];
     let api = match$1[0];
     match = [
@@ -1687,6 +1611,17 @@ function Make($star) {
       api,
       role
     ];
+  } else {
+    let schema = AppSync_SdlDecorate$ReventlessAws.stampCanonicalTypes(AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(emptyBaseFragment, []));
+    let match$2 = AppSync_Adapter$ReventlessAws.makeSourceApiResource("DomainApi", schema, {});
+    let role$1 = match$2[1];
+    let api$1 = match$2[0];
+    match = [
+      api$1,
+      role$1,
+      api$1,
+      role$1
+    ];
   }
   let domainApiRole = match[1];
   let domainApi = match[0];
@@ -1717,7 +1652,7 @@ function Make($star) {
       http: dnsHttp
     }));
     let api_name = Pulumi.output("");
-    let api$1 = {
+    let api$2 = {
       apiId: api_apiId,
       apiArn: api_apiArn,
       dns: api_dns,
@@ -1725,7 +1660,7 @@ function Make($star) {
     };
     domainEventsApiOpt = {
       name: "DomainEventsApi",
-      api: api$1,
+      api: api$2,
       defaultNamespace: undefined
     };
   } else {
@@ -1905,13 +1840,6 @@ function Make($star) {
     project: UiFragments_Projection$ReventlessCore.project,
     moduleUrl: UiFragments_Projection$ReventlessCore.moduleUrl
   });
-  let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
-    types: [],
-    mutations: [],
-    queries: [],
-    subscriptions: [],
-    subscriptionSources: []
-  });
   let Make$9 = FragmentConfig => {
     let Builder = Api_Builder$ReventlessCore.Make({
       makeApiResource: AppSync_Adapter$ReventlessAws.makeApiResource,
@@ -1926,38 +1854,6 @@ function Make($star) {
   let Api = {
     Make: Make$9
   };
-  let deploySchemaHashPrefix = "deploy-schema-hash:";
-  let readSchemaHash = async (tableName, apiId) => {
-    let key = Object.fromEntries([[
-        "id",
-        deploySchemaHashPrefix + apiId
-      ]]);
-    try {
-      let result = await DynamoDb_DocumentClient$AwsSdk.GetCommand.send(new LibDynamodb.GetCommand({
-        TableName: tableName,
-        Key: key
-      }));
-      return Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(result.Item, item => Stdlib_JSON.Decode.object(item)), d => d["hash"]), v => Stdlib_JSON.Decode.string(v));
-    } catch (exn) {
-      return;
-    }
-  };
-  let writeSchemaHash = async (tableName, apiId, hash) => {
-    let item = Object.fromEntries([
-      [
-        "id",
-        deploySchemaHashPrefix + apiId
-      ],
-      [
-        "hash",
-        hash
-      ]
-    ]);
-    await DynamoDb_DocumentClient$AwsSdk.PutCommand.send(new LibDynamodb.PutCommand({
-      Item: item,
-      TableName: tableName
-    }));
-  };
   let hooksApiRef = {
     contents: undefined
   };
@@ -1967,6 +1863,9 @@ function Make($star) {
   let hooksAdminApiRef = {
     contents: undefined
   };
+  let mergedSchemaPushedRef = {
+    contents: undefined
+  };
   let resolveHookedApi = () => {
     let match = hooksApiRef.contents;
     if (match !== undefined) {
@@ -1983,34 +1882,6 @@ function Make($star) {
       return resolveHookedApi();
     }
   };
-  let deployWaiterDelay = ms => new Promise((resolve, param) => {
-    setTimeout(() => resolve(), ms);
-  });
-  let waitForApiFragmentPush = async (endpoint, region, pluginId, sinceAt) => {
-    let loop = async attempt => {
-      if (attempt >= 90) {
-        return Stdlib_JsError.throwWithMessage(`Timed out (>3min) waiting for the platform to push ` + pluginId + `'s API fragment — check the AdminEventCollector Lambda logs.`);
-      }
-      let data = await Util_AppSync_Caller$ReventlessAws.sendQuery(endpoint, region, "query { Platform_ApiFragments { pluginId pushStatus pushMessage pushedAt } }");
-      let row = Stdlib_Option.flatMap(Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(data, Stdlib_JSON.Decode.object), d => d["Platform_ApiFragments"]), Stdlib_JSON.Decode.array), []).find(entry => Primitive_object.equal(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(entry), e => e["pluginId"]), Stdlib_JSON.Decode.string), pluginId)), Stdlib_JSON.Decode.object);
-      if (row !== undefined) {
-        let field = k => Stdlib_Option.getOr(Stdlib_Option.flatMap(row[k], Stdlib_JSON.Decode.string), "");
-        let status = field("pushStatus");
-        let fresh = field("pushedAt") >= sinceAt;
-        if (fresh && status === "ok") {
-          return log.info("registerFragmentViaApi", undefined, pluginId + ` schema push confirmed ACTIVE`);
-        } else if (fresh && status === "error") {
-          return Stdlib_JsError.throwWithMessage(`Schema push failed for ` + pluginId + `: ` + field("pushMessage"));
-        } else {
-          await deployWaiterDelay(2000);
-          return await loop(attempt + 1 | 0);
-        }
-      }
-      await deployWaiterDelay(2000);
-      return await loop(attempt + 1 | 0);
-    };
-    return await loop(0);
-  };
   let hooks_subscriptionInfraHook = Stdlib_Option.map(domainEventsApiOpt, eventsApi => (params => {
     let allEventTopics = params.allEventTopics;
     let allQueryDbs = params.allQueryDbs;
@@ -2030,253 +1901,22 @@ function Make($star) {
     StateTopic_AppSync$ReventlessAws.finish(eventsApi, {});
   }));
   let hooks_preResolversSchemaHook = (name, version, pluginFragment) => {
-    log.info("preResolversSchemaHook", undefined, `Pushing schema for plugin ` + name + `@` + version + ` to AppSync`);
-    let capturedDeployTarget = currentDeployTarget.contents;
-    if (platformStackRef !== undefined) {
-      let apiTargetName;
-      apiTargetName = capturedDeployTarget === "Domain" ? "Domain" : "Platform";
-      let match = apiConfigRef.contents;
-      let platformApi = match !== undefined ? match.platformApi : domainApi;
-      let region = Stdlib_Option.getOr(new Pulumi.Config("aws").get("region"), "unknown");
-      let endpointOutput = Output$Pulumi.flatMap(platformApi, api => api.uris).apply(uris => uris.GRAPHQL);
-      ApiFragmentDeregistration$ReventlessAws.make(name + `ApiFragmentRegistration`, name, endpointOutput, region, undefined);
-      return Output$Pulumi.flatMap(endpointOutput, endpoint => {
-        let run = async () => {
-          let at = new Date().toISOString();
-          let variables = {
-            id: "registry",
-            pluginId: name,
-            fragment: {
-              encoded: pluginFragment.encoded,
-              protocol: pluginFragment.protocol
-            },
-            apiTarget: Util_AppSync_Caller$ReventlessAws.graphqlEnum(apiTargetName),
-            at: at
-          };
-          log.info("registerFragmentViaApi", undefined, `Registering API fragment for ` + name + ` (` + apiTargetName + `) via ` + endpoint);
-          let result = await Util_AppSync_Caller$ReventlessAws.sendMutation(endpoint, region, "Platform_ApiFragmentRegistry_RegisterApiFragment", "{ __typename ... on CommandAccepted { eventCount } ... on CommandRejected { errorCode errorDetail } }", variables);
-          let outcome = Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(result, Stdlib_JSON.Decode.object), d => d["Platform_ApiFragmentRegistry_RegisterApiFragment"]), Stdlib_JSON.Decode.object);
-          if (outcome === undefined) {
-            return await waitForApiFragmentPush(endpoint, region, name, at);
-          }
-          let typename = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["__typename"], Stdlib_JSON.Decode.string), "");
-          switch (typename) {
-            case "CommandAccepted" :
-              let eventCount = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["eventCount"], Stdlib_JSON.Decode.float), 0.0);
-              if (eventCount > 0.0) {
-                return await waitForApiFragmentPush(endpoint, region, name, at);
-              } else {
-                return log.info("registerFragmentViaApi", undefined, name + ` fragment unchanged — no push needed`);
-              }
-            case "CommandRejected" :
-              let code = Stdlib_Option.getOr(Stdlib_Option.flatMap(outcome["errorCode"], Stdlib_JSON.Decode.string), "unknown");
-              return Stdlib_JsError.throwWithMessage(`RegisterApiFragment rejected for ` + name + `: ` + code);
-            default:
-              return await waitForApiFragmentPush(endpoint, region, name, at);
-          }
-        };
-        return run();
-      });
-    }
-    let match$1;
-    if (capturedDeployTarget === "Domain") {
-      match$1 = [
-        "deploy-schema:",
-        domainApi
-      ];
-    } else {
-      let match$2 = apiConfigRef.contents;
-      let api = match$2 !== undefined ? match$2.platformApi : domainApi;
-      match$1 = [
-        "deploy-schema-platform:",
-        api
-      ];
-    }
-    let targetApi = match$1[1];
-    let schemaPrefix = match$1[0];
-    let readStackRefString = (stackRef, key) => {
-      let direct = stackRef.getOutput(key);
-      let defaultOutput = stackRef.getOutput("default");
-      return Pulumi.all([
-        direct,
-        defaultOutput
-      ]).apply(param => {
-        let name = Stdlib_Option.flatMap(param[0], v => Stdlib_JSON.Decode.string(v));
-        if (name !== undefined) {
-          return name;
-        } else {
-          return Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(param[1], d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v));
-        }
-      });
-    };
-    let schemaPersistenceTableNameOutput;
-    if (platformStackRef !== undefined) {
-      let stackRef = Primitive_option.valFromOption(platformStackRef);
-      schemaPersistenceTableNameOutput = Pulumi.all([
-        readStackRefString(stackRef, "pluginSchemaPersistenceTableName"),
-        readStackRefString(stackRef, "pluginRmTableName")
-      ]).apply(param => {
-        let dedicated = param[0];
-        if (dedicated !== undefined) {
-          return dedicated;
-        } else {
-          return param[1];
-        }
+    let sdl = AppSync_Adapter$ReventlessAws.stitchStandaloneWithAwsDirectives(pluginFragment);
+    let pushed = Output$Pulumi.flatMap(domainApi, api => Output$Pulumi.flatMap(api.id, apiId => {
+      log.info("preResolversSchemaHook", undefined, `Pushing subgraph schema for ` + name + `@` + version + ` to source API ` + apiId);
+      let client = AppSync_Adapter$ReventlessAws.getClient();
+      return AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(client, {
+        apiId: apiId,
+        definition: sdl
+      }).then(async () => {
+        await AppSync_Adapter$ReventlessAws.waitForSchemaActive(client, apiId, undefined, undefined);
+        return log.info("preResolversSchemaHook", undefined, "subgraph schema is ACTIVE");
       });
-    } else {
-      schemaPersistenceTableNameOutput = Pulumi.output(undefined);
-    }
-    return Output$Pulumi.flatMap(schemaPersistenceTableNameOutput, tableNameOpt => {
-      let writeAndScanFragments = () => {
-        if (tableNameOpt !== undefined) {
-          let deployItem = Object.fromEntries([
-            [
-              "id",
-              schemaPrefix + name
-            ],
-            [
-              "fragment",
-              pluginFragment.encoded
-            ]
-          ]);
-          log.info("preResolversSchemaHook", undefined, `Writing deploy-schema entry for ` + name + ` to ` + tableNameOpt);
-          let scanAllDeploySchemaItems = async () => {
-            let allItems = [];
-            let startKey;
-            let more = true;
-            while (more) {
-              let result = await DynamoDb_DocumentClient$AwsSdk.ScanCommand.send(new LibDynamodb.ScanCommand({
-                TableName: tableNameOpt,
-                ExclusiveStartKey: startKey,
-                ExpressionAttributeNames: Object.fromEntries([[
-                    "#id",
-                    "id"
-                  ]]),
-                ExpressionAttributeValues: Object.fromEntries([[
-                    ":prefix",
-                    schemaPrefix
-                  ]]),
-                FilterExpression: "begins_with(#id, :prefix)"
-              }));
-              Stdlib_Option.getOr(result.Items, []).forEach(item => {
-                allItems.push(item);
-              });
-              let k = result.LastEvaluatedKey;
-              if (k !== undefined) {
-                startKey = k;
-              } else {
-                more = false;
-              }
-            };
-            return allItems;
-          };
-          return Stdlib_Promise.$$catch(DynamoDb_DocumentClient$AwsSdk.PutCommand.send(new LibDynamodb.PutCommand({
-            Item: deployItem,
-            TableName: tableNameOpt
-          })).then(param => {
-            log.info("preResolversSchemaHook", undefined, `Scanning ` + tableNameOpt + ` for deploy-schema entries`);
-            return scanAllDeploySchemaItems();
-          }).then(items => {
-            let fragments = Stdlib_Array.filterMap(items, item => {
-              try {
-                let obj = JSON.parse(JSON.stringify(item));
-                let fragmentJson = Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(obj), d => d["fragment"]);
-                if (fragmentJson === undefined) {
-                  return;
-                }
-                let encoded = Stdlib_JSON.Decode.string(fragmentJson);
-                if (encoded !== undefined) {
-                  return {
-                    encoded: encoded,
-                    protocol: "graphql"
-                  };
-                } else {
-                  return;
-                }
-              } catch (exn) {
-                return;
-              }
-            });
-            log.info("preResolversSchemaHook", undefined, `Found ` + fragments.length.toString() + ` deploy-schema entries`);
-            return Promise.resolve(fragments);
-          }), err => {
-            let msg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
-            log.info("preResolversSchemaHook", undefined, `DynamoDB write/scan failed (` + msg + `) — using current plugin only`);
-            return Promise.resolve([pluginFragment]);
-          });
-        }
-        log.info("preResolversSchemaHook", undefined, "No pluginSchemaPersistenceTableName / pluginRmTableName — skipping fragment persistence");
-        return Promise.resolve([pluginFragment]);
-      };
-      return Output$Pulumi.flatMap(targetApi, api => Output$Pulumi.flatMap(api.id, apiId => {
-        let runSchemaPush = () => writeAndScanFragments().then(async allPluginFragments => {
-          let baseFragment;
-          baseFragment = capturedDeployTarget === "Domain" ? emptyBaseFragment : AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(false), "Admin", AdminApi$ReventlessCore.systemCallerFieldNames);
-          let sdl = AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(baseFragment, allPluginFragments);
-          let currentHash = AppSync_Adapter$ReventlessAws.sha256Hex(sdl);
-          let storedHash = tableNameOpt !== undefined ? await readSchemaHash(tableNameOpt, apiId) : undefined;
-          let client = AppSync_Adapter$ReventlessAws.getClient();
-          let liveSdl = await AppSync_Adapter$ReventlessAws.getIntrospectionSdl(client, apiId);
-          let countRoots = s => (GraphQL_Stitcher$ReventlessCore.countRootTypeFields(s, "Mutation") + GraphQL_Stitcher$ReventlessCore.countRootTypeFields(s, "Query") | 0) + GraphQL_Stitcher$ReventlessCore.countRootTypeFields(s, "Subscription") | 0;
-          let missingFields = GraphQL_Stitcher$ReventlessCore.missingRootFields(sdl, liveSdl);
-          let skipPush = storedHash !== undefined && storedHash === currentHash ? (
-              liveSdl === "" ? (log.info("preResolversSchemaHook", undefined, `hash matches but live schema could not be introspected — forcing repair push (check appsync:GetIntrospectionSchema permission)`), false) : (
-                  missingFields.length !== 0 ? (log.info("preResolversSchemaHook", undefined, `hash matches but live schema is missing ` + missingFields.length.toString() + ` expected root field(s) (e.g. ` + missingFields.slice(0, 5).join(", ") + `) — forcing repair push`), false) : (log.info("preResolversSchemaHook", undefined, `SDL unchanged (hash ` + currentHash.slice(0, 12) + `…) and live schema is a superset of the expected root fields (` + countRoots(liveSdl).toString() + ` live); skipping push`), true)
-                )
-            ) : false;
-          if (!skipPush) {
-            if (GraphQL_Stitcher$ReventlessCore.isCatastrophicSchemaShrink(liveSdl, sdl, deploySchemaShrinkThreshold)) {
-              return log.error("preResolversSchemaHook", undefined, `ABORTED schema push for ` + apiId + `: stitched SDL (` + countRoots(sdl).toString() + ` root field(s)) would catastrophically shrink the live schema (` + countRoots(liveSdl).toString() + ` root field(s), threshold ` + deploySchemaShrinkThreshold.toString() + `) — refusing to clobber resolvers (likely a stale concurrent-deploy scan)`);
-            } else {
-              log.info("preResolversSchemaHook", undefined, `Pushing schema to API ` + apiId + ` (` + allPluginFragments.length.toString() + ` plugin fragments, new hash: ` + currentHash.slice(0, 12) + `…)`);
-              await AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(client, {
-                apiId: apiId,
-                definition: sdl
-              });
-              log.info("preResolversSchemaHook", undefined, "startSchemaCreation called, waiting for ACTIVE");
-              await AppSync_Adapter$ReventlessAws.waitForSchemaActive(client, apiId, undefined, undefined);
-              log.info("preResolversSchemaHook", undefined, "Schema is ACTIVE");
-              if (tableNameOpt !== undefined) {
-                return await writeSchemaHash(tableNameOpt, apiId, currentHash);
-              } else {
-                return;
-              }
-            }
-          }
-        });
-        if (tableNameOpt !== undefined) {
-          return AppSync_Adapter$ReventlessAws.withSchemaPushLock(tableNameOpt, apiId, undefined, undefined, runSchemaPush);
-        } else {
-          return runSchemaPush();
-        }
-      }));
-    });
-  };
-  let hooks_preAdminResolversSchemaHook = adminBarrier => {
-    let match = splitApiOutputsRef.contents;
-    let targetApiOpt = match !== undefined ? match.platformApi : undefined;
-    if (targetApiOpt !== undefined) {
-      let adminBaseFragment = AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(false), "Admin", AdminApi$ReventlessCore.systemCallerFieldNames);
-      let sdl = AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(adminBaseFragment, []);
-      return Output$Pulumi.flatMap(Pulumi.all([
-        targetApiOpt,
-        adminBarrier
-      ]), param => Output$Pulumi.flatMap(param[0].id, apiId => {
-        log.info("preAdminResolversSchemaHook", undefined, `Pushing admin schema to ` + apiId);
-        let client = AppSync_Adapter$ReventlessAws.getClient();
-        return AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(client, {
-          apiId: apiId,
-          definition: sdl
-        }).then(async () => {
-          log.info("preAdminResolversSchemaHook", undefined, "startSchemaCreation called, waiting for ACTIVE");
-          await AppSync_Adapter$ReventlessAws.waitForSchemaActive(client, apiId, undefined, undefined);
-          return log.info("preAdminResolversSchemaHook", undefined, "schema is ACTIVE");
-        });
-      }));
-    }
-    log.error("preAdminResolversSchemaHook", undefined, "split mode but the PlatformApi is not available at hook time — SKIPPING the admin schema push to avoid clobbering the DomainApi (pushing admin-base here would wipe every plugin field)");
-    return adminBarrier;
+    }));
+    mergedSchemaPushedRef.contents = pushed;
+    return pushed;
   };
+  let hooks_preAdminResolversSchemaHook = adminBarrier => adminBarrier;
   let hooks_inboundAppSyncResolverHook = param => InboundTranslationResolvers_AppSync$ReventlessAws.make(resolveHookedApi(), param.runtime, param.fieldNames, param.opts);
   let hooks_dcbAppSyncResolverHook = param => {
     let onAdminApi = param.onAdminApi;
@@ -2537,6 +2177,7 @@ function Make($star) {
   };
   let makePlatform = (version, plugins) => {
     log.info("Platform", undefined, `v` + version);
+    Pervasives.failwith("mergedApi mode is supported with deployPlatform only — deploy the platform with deployPlatform and each plugin with deployPlugin.");
     let scheduler = makeScheduler();
     hooks_scheduler.contents = scheduler;
     hooksApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(domainApi);
@@ -2610,9 +2251,20 @@ function Make($star) {
     hooks_scheduler.contents = scheduler;
     hooksApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(domainApi);
     hooksApiRoleRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(domainApiRole);
-    let match = AppSync_Adapter$ReventlessAws.makeApiResource("PlatformApi", {});
+    let match = AppSync_Adapter$ReventlessAws.makeSourceApiResource("PlatformApi", adminSourceSdl(), {});
     let platformApiRole = match[1];
     let platformApi = match[0];
+    AppSync_MergedApi$ReventlessAws.assertCompatiblePrimaryAuth(AppSync_MergedApi$ReventlessAws.authenticationTypeName(AppSync_Adapter$ReventlessAws.primaryAuthenticationType), AppSync_MergedApi$ReventlessAws.primaryAuthMode);
+    let domainMerged = AppSync_MergedApi$ReventlessAws.make("DomainMergedApi", {});
+    let platformMerged = AppSync_MergedApi$ReventlessAws.make("PlatformMergedApi", {});
+    let platformAssoc = AppSync_MergedApi$ReventlessAws.associateSource("PlatformAdminSourceAssociation", platformMerged, platformApi, {});
+    let domainAssoc = AppSync_MergedApi$ReventlessAws.associateSource("DomainBaseSourceAssociation", domainMerged, domainApi, {});
+    let mergedOutputs = {
+      domainMerged: domainMerged,
+      platformMerged: platformMerged,
+      domainMergeGate: AppSync_MergedApi$ReventlessAws.mergeStatusGate(domainMerged, domainAssoc),
+      platformMergeGate: AppSync_MergedApi$ReventlessAws.mergeStatusGate(platformMerged, platformAssoc)
+    };
     hooksAdminApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(platformApi);
     splitApiOutputsRef.contents = {
       platformApi: platformApi,
@@ -2628,37 +2280,8 @@ function Make($star) {
       };
     }
     let domainApiId = Output$Pulumi.flatMap(domainApi, api => api.id);
-    let updateApiSchema = async queryEngine => {
-      let apiId = domainApiId.get();
-      let plugins = await queryEngine.scan("Plugins", [[
-          "status",
-          "Contains",
-          {
-            TAG: "String",
-            _0: "Connected"
-          }
-        ]], 1000);
-      let fragments = Stdlib_Array.filterMap(plugins, json => {
-        try {
-          let state = S.parseOrThrow(json, PluginsReadModelSpec$ReventlessCore.stateSchema);
-          let match = state.apiTarget;
-          if (match === "Platform") {
-            return;
-          } else {
-            return state.apiSchemaFragment;
-          }
-        } catch (exn) {
-          return;
-        }
-      });
-      let sdl = AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(emptyBaseFragment, fragments);
-      return await AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(AppSync_Adapter$ReventlessAws.getClient(), {
-        apiId: apiId,
-        definition: sdl
-      });
-    };
     let PluginExtensionPoint = Plugin_ExtensionPoint_Builder$ReventlessAws.MakeWithConfig({
-      updateApiSchema: updateApiSchema,
+      updateApiSchema: undefined,
       manageSubscriptions: undefined
     });
     let admin = Admin.construct(version, [PluginExtensionPoint], [
@@ -2670,14 +2293,15 @@ function Make($star) {
     ], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     let apiSchemaPushEventTopics = Aggregate$ReventlessCore.allEventTopics(admin.aggregatesOutputs);
     let apiSchemaPushCmdTopics = Aggregate$ReventlessCore.allCommandTopics(admin.aggregatesOutputs);
-    let apiSchemaPushCmdTopicUrl = Stdlib_Option.getOr(Stdlib_Option.map(admin.aggregatesOutputs[ApiFragmentRegistrySpec$ReventlessCore.name], agg => Output$Pulumi.flatMap(agg.commandTopic, ct => {
-      let r = ct.resources[0];
-      if (r !== undefined) {
-        return r.id;
-      } else {
-        return Pulumi.output("");
-      }
-    })), Pulumi.output(""));
+    let agg = admin.aggregatesOutputs[ApiFragmentRegistrySpec$ReventlessCore.name];
+    let apiSchemaPushCmdTopicUrl = agg !== undefined ? Output$Pulumi.flatMap(agg.commandTopic, ct => {
+        let r = ct.resources[0];
+        if (r !== undefined) {
+          return r.id;
+        } else {
+          return Pulumi.output("");
+        }
+      }) : Pulumi.output("");
     let apiSchemaPushEnv = Object.fromEntries([
       [
         "API_SCHEMA_PUSH_DOMAIN_API_ID",
@@ -2724,10 +2348,6 @@ function Make($star) {
     } else {
       pluginReadModelTableName = undefined;
     }
-    let pluginSchemaPersistenceTable = Util_DynamoDb$ReventlessAws.makeTable([{
-        name: "id",
-        type: "S"
-      }], undefined, undefined, undefined, undefined, {}, "PluginSchemaPersistence");
     PluginExtensionPointRuntime_Builder$ReventlessAws.registerPluginExtensionPoint(pluginReadModelTableName, hooks_schedulerRoleUrn.contents, undefined);
     let pluginEpEventTopicArn = Output$Pulumi.flatMap(admin.extensionPointsOutputs, eps => {
       let ep = eps.find(ep => ep.name === PluginExtensionPointSpec$ReventlessInfra.name);
@@ -2744,24 +2364,23 @@ function Make($star) {
         return Pulumi.output("NOT_AVAILABLE");
       }
     });
-    let r$1 = Stdlib_Option.flatMap(admin.readModelsOutputs["ApiFragments"], rm => rm.queryDb.resources[0]);
-    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, pluginSchemaPersistenceTable.name, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, false, Output$Pulumi.flatMap(platformApi, api => api.id), r$1 !== undefined ? r$1.name : undefined, AutomationSliceRuntime_Builder_Single$ReventlessAws.getDcbQueueUrl(), true, undefined);
+    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, false, undefined);
     if (pluginReadModelTableName !== undefined) {
       AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(pluginReadModelTableName);
       Platform_ComponentDefinitions_Lambda$ReventlessAws.make(platformApi, pluginReadModelTableName, {});
     }
     let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
-      let r$2 = rm.queryDb.resources[0];
-      if (r$2 !== undefined) {
-        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$2.name, admin.adminSchemaPushed, {});
+      let r$1 = rm.queryDb.resources[0];
+      if (r$1 !== undefined) {
+        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, admin.adminSchemaPushed, {});
       }
     }
     let rm$1 = admin.readModelsOutputs["ApiFragments"];
     if (rm$1 !== undefined) {
-      let r$3 = rm$1.queryDb.resources[0];
-      if (r$3 !== undefined) {
-        Platform_ApiFragments_Lambda$ReventlessAws.make(platformApi, r$3.name, admin.adminSchemaPushed, {});
+      let r$2 = rm$1.queryDb.resources[0];
+      if (r$2 !== undefined) {
+        Platform_ApiFragments_Lambda$ReventlessAws.make(platformApi, r$2.name, admin.adminSchemaPushed, {});
       }
     }
     Pulumi$Pulumi.$$export("platformApiId", Output$Pulumi.flatMap(platformApi, api => api.id));
@@ -2770,6 +2389,22 @@ function Make($star) {
     Pulumi$Pulumi.$$export("domainApiId", Output$Pulumi.flatMap(domainApi, api => api.id));
     Pulumi$Pulumi.$$export("domainApiEndpoint", Output$Pulumi.flatMap(domainApi, api => api.uris.apply(uris => uris.GRAPHQL)));
     Pulumi$Pulumi.$$export("domainApiRoleArn", Output$Pulumi.flatMap(domainApiRole, role => role.arn));
+    if (mergedOutputs !== undefined) {
+      let platformMerged$1 = mergedOutputs.platformMerged;
+      let domainMerged$1 = mergedOutputs.domainMerged;
+      let mergeGatedArn = (merged, gate) => Pulumi.all([
+        Output$Pulumi.flatMap(merged.api, api => api.arn),
+        gate
+      ]).apply(param => param[0]);
+      let mergedEndpoint = merged => Output$Pulumi.flatMap(merged.api, api => api.uris.apply(uris => uris.GRAPHQL));
+      Pulumi$Pulumi.$$export("domainMergedApiArn", mergeGatedArn(domainMerged$1, mergedOutputs.domainMergeGate));
+      Pulumi$Pulumi.$$export("domainMergedApiId", Output$Pulumi.flatMap(domainMerged$1.api, api => api.id));
+      Pulumi$Pulumi.$$export("domainMergedApiEndpoint", mergedEndpoint(domainMerged$1));
+      Pulumi$Pulumi.$$export("platformMergedApiArn", mergeGatedArn(platformMerged$1, mergedOutputs.platformMergeGate));
+      Pulumi$Pulumi.$$export("platformMergedApiId", Output$Pulumi.flatMap(platformMerged$1.api, api => api.id));
+      Pulumi$Pulumi.$$export("platformMergedApiEndpoint", mergedEndpoint(platformMerged$1));
+      Pulumi$Pulumi.$$export("mergedApiPrimaryAuth", Pulumi.output(AppSync_MergedApi$ReventlessAws.primaryAuthMode));
+    }
     if (domainEventsApiOpt !== undefined) {
       Pulumi$Pulumi.$$export("eventsApiArn", domainEventsApiOpt.api.apiArn);
       Pulumi$Pulumi.$$export("eventsApiDns", domainEventsApiOpt.api.dns.apply(dns => Stdlib_Option.getOr(dns.http, "")));
@@ -2777,11 +2412,12 @@ function Make($star) {
     if (pluginReadModelTableName !== undefined) {
       Pulumi$Pulumi.$$export("pluginRmTableName", pluginReadModelTableName);
     }
-    Pulumi$Pulumi.$$export("pluginSchemaPersistenceTableName", pluginSchemaPersistenceTable.name);
     Plugin_Helpers$ReventlessCore.exportPlatformOutputs(admin.extensionPointsOutputs, admin.aggregatesOutputs, admin.readModelsOutputs, admin.dcbEventLogOutputs, admin.stateChangeSlicesOutputs, admin.stateViewSlicesOutputs, admin.automationSlicesOutputs, admin.outboundTranslationSlicesOutputs, admin.inboundTranslationSlicesOutputs);
-    let resolvedDomainApiEndpoint = Output$Pulumi.flatMap(domainApi, api => api.uris.apply(uris => uris.GRAPHQL));
+    let clientDomainApi = mergedOutputs !== undefined ? mergedOutputs.domainMerged.api : domainApi;
+    let clientPlatformApi = mergedOutputs !== undefined ? mergedOutputs.platformMerged.api : platformApi;
+    let resolvedDomainApiEndpoint = Output$Pulumi.flatMap(clientDomainApi, api => api.uris.apply(uris => uris.GRAPHQL));
     let resolvedDomainApiRoleArn = Output$Pulumi.flatMap(domainApiRole, role => role.arn);
-    let resolvedPlatformApiEndpoint = Output$Pulumi.flatMap(platformApi, api => api.uris.apply(uris => uris.GRAPHQL));
+    let resolvedPlatformApiEndpoint = Output$Pulumi.flatMap(clientPlatformApi, api => api.uris.apply(uris => uris.GRAPHQL));
     let resolvedPlatformApiRoleArn = Output$Pulumi.flatMap(platformApiRole, role => role.arn);
     let adminResourcesOutput = Pulumi.all(Object.values(admin.aggregatesOutputs).map(agg => Aggregate$ReventlessCore.toResolvedOutputs(agg).apply(r => [
       r.eventLog.resources,
@@ -2912,6 +2548,47 @@ function Make($star) {
     Pulumi$Pulumi.$$export("_interopMeta", Plugin_Helpers$ReventlessCore.getInteropMeta());
     let pluginOutputs = Component$ReventlessCore.outputs(pluginComponent);
     Plugin_Helpers$ReventlessCore.exportPluginOutputs(pluginOutputs);
+    if (platformStackRef !== undefined) {
+      let stackRef = Primitive_option.valFromOption(platformStackRef);
+      let defaultOutput = stackRef.getOutput("default");
+      let getMergedExport = key => {
+        let direct = stackRef.getOutput(key);
+        return Pulumi.all([
+          direct,
+          defaultOutput
+        ]).apply(param => {
+          let direct = param[0];
+          if (direct !== undefined) {
+            return direct;
+          } else {
+            return Stdlib_Option.getOrThrow(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_Option.flatMap(param[1], d => Stdlib_JSON.Decode.object(d)), d => d[key]), v => Stdlib_JSON.Decode.string(v)), `Platform stack does not export '` + key + `' — deploy the platform with mergedApi=true first`);
+          }
+        });
+      };
+      let mergedApiArn;
+      mergedApiArn = apiTarget === "Domain" ? getMergedExport("domainMergedApiArn") : getMergedExport("platformMergedApiArn");
+      let checkedMergedApiArn = Pulumi.all([
+        mergedApiArn,
+        getMergedExport("mergedApiPrimaryAuth")
+      ]).apply(param => {
+        AppSync_MergedApi$ReventlessAws.assertCompatiblePrimaryAuth(AppSync_MergedApi$ReventlessAws.authenticationTypeName(AppSync_Adapter$ReventlessAws.primaryAuthenticationType), param[1]);
+        return param[0];
+      });
+      let pushed = mergedSchemaPushedRef.contents;
+      let schemaPushed = pushed !== undefined ? pushed : Pulumi.output();
+      let arnAfterSchemaPush = Pulumi.all([
+        checkedMergedApiArn,
+        schemaPushed
+      ]).apply(param => param[0]);
+      let association = AppSync_MergedApi$ReventlessAws.associateSourceWithMergedArn("PluginSourceAssociation", arnAfterSchemaPush, domainApi, {});
+      let mergeGate = AppSync_MergedApi$ReventlessAws.mergeStatusGateWith(checkedMergedApiArn, association);
+      Pulumi$Pulumi.$$export("sourceApiAssociationId", Pulumi.all([
+        association.associationId,
+        mergeGate
+      ]).apply(param => param[0]));
+      Pulumi$Pulumi.$$export("pluginSourceApiId", Output$Pulumi.flatMap(domainApi, api => api.id));
+      Pulumi$Pulumi.$$export("pluginSourceApiEndpoint", Output$Pulumi.flatMap(domainApi, api => api.uris.apply(uris => uris.GRAPHQL)));
+    }
     provisionPgChangeFeedRelay();
     let sel = QueryDbBackend$ReventlessAws.get();
     if (sel !== undefined) {
@@ -2995,7 +2672,6 @@ function Make($star) {
 
 export {
   log,
-  deploySchemaShrinkThreshold,
   apiConfigRef,
   getApiConfig,
   splitApiOutputsRef,