@reventlessdev/reventless-aws 3.0.0-alpha.197 → 3.0.0-alpha.199

package/src/Platform.res.mjs

@@ -12,7 +12,9 @@ import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output
 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";
@@ -27,7 +29,9 @@ import * as ReadModel$ReventlessCore from "@reventlessdev/reventless-core/src/co
 import * as PluginSpec$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/lifecycle/PluginSpec.res.mjs";
 import * as Api_Builder$ReventlessCore from "@reventlessdev/reventless-core/src/components/Api/Api_Builder.res.mjs";
 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 ApiFragments$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/StateViewSlice/ApiFragments.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";
@@ -50,7 +54,10 @@ 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 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";
+import * as ApiFragmentRegistry$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/StateChangeSlice/ApiFragmentRegistry.res.mjs";
 import * as ClonerRunner_Fargate$ReventlessAws from "./plugin/cloner/ClonerRunner_Fargate.res.mjs";
 import * as QueryEngine_DynamoDb$ReventlessAws from "./adapter/QueryEngine/QueryEngine_DynamoDb.res.mjs";
 import * as PluginRuntime_Builder$ReventlessAws from "./plugin/runtime/PluginRuntime_Builder.res.mjs";
@@ -62,9 +69,12 @@ import * as AutomationSlice_Builder$ReventlessAws from "./components/AutomationS
 import * as EventTopicPublisher_SNS$ReventlessAws from "./adapter/EventTopic/EventTopicPublisher_SNS.res.mjs";
 import * as ExtensionPointMapping$ReventlessInfra from "@reventlessdev/reventless-infra/src/types/ExtensionPointMapping.res.mjs";
 import * as PgQueryResolver_Builder$ReventlessAws from "./adapter/QueryDb/PgQueryResolver_Builder.res.mjs";
+import * as UiFragments_Projection$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UiFragmentRegistry/StateViewSlice/UiFragments_Projection.res.mjs";
 import * as Aggregate_Builder_Single$ReventlessAws from "./components/Aggregate_Builder_Single.res.mjs";
+import * as ApiFragments_Projection$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/StateViewSlice/ApiFragments_Projection.res.mjs";
 import * as ReadModel_Builder_Single$ReventlessAws from "./components/ReadModel_Builder_Single.res.mjs";
 import * as StateChangeSlice_Builder$ReventlessAws from "./components/StateChangeSlice_Builder.res.mjs";
+import * as ApiFragmentDeregistration$ReventlessAws from "./adapter/Api/ApiFragmentDeregistration.res.mjs";
 import * as EventCollectorChannel_SQS$ReventlessAws from "./adapter/EventCollector/EventCollectorChannel_SQS.res.mjs";
 import * as PgChangeFeedRelay_Builder$ReventlessAws from "./adapter/Postgres/PgChangeFeedRelay_Builder.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "./adapter/Runtime/RuntimeEnvironment_Lambda.res.mjs";
@@ -72,23 +82,23 @@ import * as PluginExtensionPointSpec$ReventlessInfra from "@reventlessdev/revent
 import * as Platform_UIFragments_Lambda$ReventlessAws from "./adapter/Api/Platform_UIFragments_Lambda.res.mjs";
 import * as CommandTopicChannel_SQS_Sync$ReventlessAws from "./adapter/CommandTopic/CommandTopicChannel_SQS_Sync.res.mjs";
 import * as EventLogSubscription_AppSync$ReventlessAws from "./adapter/EventLogSubscription/EventLogSubscription_AppSync.res.mjs";
+import * as Platform_ApiFragments_Lambda$ReventlessAws from "./adapter/Api/Platform_ApiFragments_Lambda.res.mjs";
+import * as UiFragmentRegistry_Behavior$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UiFragmentRegistry/StateChangeSlice/UiFragmentRegistry_Behavior.res.mjs";
+import * as ApiFragmentRegistry_Behavior$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/StateChangeSlice/ApiFragmentRegistry_Behavior.res.mjs";
 import * as CommandTopicChannel_SQS_Async$ReventlessAws from "./adapter/CommandTopic/CommandTopicChannel_SQS_Async.res.mjs";
 import * as Plugin_ExtensionPoint_Builder$ReventlessAws from "./plugin/stack/Plugin_ExtensionPoint_Builder.res.mjs";
 import * as QueryDbStorage_DynamoDbStream$ReventlessAws from "./adapter/QueryDb/QueryDbStorage_DynamoDbStream.res.mjs";
 import * as StateViewSlice_Builder_Stream$ReventlessAws from "./components/StateViewSlice_Builder_Stream.res.mjs";
-import * as UIFragmentRegistryProjection$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UIFragmentRegistryProjection.res.mjs";
 import * as Aggregate_Builder_Single_Async$ReventlessAws from "./components/Aggregate_Builder_Single_Async.res.mjs";
 import * as AggregateRuntime_Builder_Single$ReventlessAws from "./adapter/Runtime/AggregateRuntime_Builder_Single.res.mjs";
 import * as CommandTopicChannel_SQS_Runtime$ReventlessAws from "./adapter/CommandTopic/CommandTopicChannel_SQS_Runtime.res.mjs";
 import * as InboundTranslationSlice_Builder$ReventlessAws from "./components/InboundTranslationSlice_Builder.res.mjs";
 import * as ReadModel_Builder_Single_Stream$ReventlessAws from "./components/ReadModel_Builder_Single_Stream.res.mjs";
 import * as OutboundTranslationSlice_Builder$ReventlessAws from "./components/OutboundTranslationSlice_Builder.res.mjs";
-import * as UIFragmentRegistryReadModelSpec$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UIFragmentRegistryReadModelSpec.res.mjs";
 import * as CommandGeneratorResolvers_AppSync$ReventlessAws from "./adapter/CommandGenerator/CommandGeneratorResolvers_AppSync.res.mjs";
 import * as EventTopicPublisher_DynamoDbStream$ReventlessAws from "./adapter/EventTopic/EventTopicPublisher_DynamoDbStream.res.mjs";
 import * as InboundTranslationResolvers_AppSync$ReventlessAws from "./adapter/CommandGenerator/InboundTranslationResolvers_AppSync.res.mjs";
 import * as PluginExtensionPointRuntime_Builder$ReventlessAws from "./plugin/runtime/PluginExtensionPointRuntime_Builder.res.mjs";
-import * as ReadModel_Builder_NoResolver_Stream$ReventlessAws from "./components/ReadModel_Builder_NoResolver_Stream.res.mjs";
 import * as EventCollectorRuntime_Builder_Single$ReventlessAws from "./adapter/Runtime/EventCollectorRuntime_Builder_Single.res.mjs";
 import * as Platform_ComponentDefinitions_Lambda$ReventlessAws from "./adapter/Api/Platform_ComponentDefinitions_Lambda.res.mjs";
 import * as StateViewSliceRuntime_Builder_Single$ReventlessAws from "./adapter/Runtime/StateViewSliceRuntime_Builder_Single.res.mjs";
@@ -143,7 +153,8 @@ function MakeWithConfig(Config) {
       subnetIds: pg.subnetIds
     });
     QueryDbBackend$ReventlessAws.exempt(PluginsReadModelSpec$ReventlessCore.name);
-    QueryDbBackend$ReventlessAws.exempt(UIFragmentRegistryReadModelSpec$ReventlessCore.name);
+    QueryDbBackend$ReventlessAws.exempt(UiFragments$ReventlessCore.name);
+    QueryDbBackend$ReventlessAws.exempt(ApiFragments$ReventlessCore.name);
   });
   let currentDeployTarget = {
     contents: "Domain"
@@ -413,17 +424,79 @@ function MakeWithConfig(Config) {
     MakeAsync: MakeAsync$1
   };
   let include = StateViewSlice_Builder$ReventlessAws.Make(ApiConfig);
+  let Make$7 = include.Make;
   let include$1 = StateViewSlice_Builder_Stream$ReventlessAws.Make(ApiConfig);
   let include$2 = AutomationSlice_Builder$ReventlessAws.Make(ApiConfig);
   let include$3 = OutboundTranslationSlice_Builder$ReventlessAws.Make(ApiConfig);
   let InboundTranslationSlice = InboundTranslationSlice_Builder$ReventlessAws.Make(ApiConfig);
+  let Spec = {
+    name: UiFragmentRegistry$ReventlessCore.name,
+    moduleUrl: UiFragmentRegistry$ReventlessCore.moduleUrl,
+    Id: Id$Reventless.$$String,
+    consumedEventSchema: UiFragmentRegistry$ReventlessCore.consumedEventSchema,
+    errorSchema: UiFragmentRegistry$ReventlessCore.errorSchema,
+    eventSchema: UiFragmentRegistry$ReventlessCore.eventSchema,
+    commandSchema: UiFragmentRegistry$ReventlessCore.commandSchema,
+    commandAuthorization: UiFragmentRegistry$ReventlessCore.commandAuthorization,
+    readConsistency: UiFragmentRegistry$ReventlessCore.readConsistency
+  };
+  let UiFragmentRegistrySlice = StateChangeSlice_Builder$ReventlessAws.Make(Spec)({
+    initialState: undefined,
+    evolve: UiFragmentRegistry_Behavior$ReventlessCore.evolve,
+    decide: UiFragmentRegistry_Behavior$ReventlessCore.decide,
+    moduleUrl: UiFragmentRegistry_Behavior$ReventlessCore.moduleUrl
+  });
+  let UiFragmentsViewSlice = Make$7({
+    name: UiFragments$ReventlessCore.name,
+    moduleUrl: UiFragments$ReventlessCore.moduleUrl,
+    stateSchema: UiFragments$ReventlessCore.stateSchema,
+    consumedEventSchema: UiFragments$ReventlessCore.consumedEventSchema,
+    config: UiFragments$ReventlessCore.config,
+    subIdConfig: undefined,
+    authorization: UiFragments$ReventlessCore.authorization,
+    visibility: UiFragments$ReventlessCore.visibility
+  })({
+    project: UiFragments_Projection$ReventlessCore.project,
+    moduleUrl: UiFragments_Projection$ReventlessCore.moduleUrl
+  });
+  let Spec$1 = {
+    name: ApiFragmentRegistry$ReventlessCore.name,
+    moduleUrl: ApiFragmentRegistry$ReventlessCore.moduleUrl,
+    Id: Id$Reventless.$$String,
+    consumedEventSchema: ApiFragmentRegistry$ReventlessCore.consumedEventSchema,
+    errorSchema: ApiFragmentRegistry$ReventlessCore.errorSchema,
+    eventSchema: ApiFragmentRegistry$ReventlessCore.eventSchema,
+    commandSchema: ApiFragmentRegistry$ReventlessCore.commandSchema,
+    commandAuthorization: ApiFragmentRegistry$ReventlessCore.commandAuthorization,
+    readConsistency: ApiFragmentRegistry$ReventlessCore.readConsistency
+  };
+  let ApiFragmentRegistrySlice = StateChangeSlice_Builder$ReventlessAws.Make(Spec$1)({
+    initialState: undefined,
+    evolve: ApiFragmentRegistry_Behavior$ReventlessCore.evolve,
+    decide: ApiFragmentRegistry_Behavior$ReventlessCore.decide,
+    moduleUrl: ApiFragmentRegistry_Behavior$ReventlessCore.moduleUrl
+  });
+  let ApiFragmentsViewSlice = Make$7({
+    name: ApiFragments$ReventlessCore.name,
+    moduleUrl: ApiFragments$ReventlessCore.moduleUrl,
+    stateSchema: ApiFragments$ReventlessCore.stateSchema,
+    consumedEventSchema: ApiFragments$ReventlessCore.consumedEventSchema,
+    config: ApiFragments$ReventlessCore.config,
+    subIdConfig: undefined,
+    authorization: ApiFragments$ReventlessCore.authorization,
+    visibility: ApiFragments$ReventlessCore.visibility
+  })({
+    project: ApiFragments_Projection$ReventlessCore.project,
+    moduleUrl: ApiFragments_Projection$ReventlessCore.moduleUrl
+  });
   let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
     types: [],
     mutations: [],
     queries: [],
-    subscriptions: []
+    subscriptions: [],
+    subscriptionSources: []
   });
-  let Make$7 = FragmentConfig => {
+  let Make$8 = FragmentConfig => {
     let Builder = Api_Builder$ReventlessCore.Make({
       makeApiResource: AppSync_Adapter$ReventlessAws.makeApiResource,
       generateFragment: AppSync_Adapter$ReventlessAws.generateFragment,
@@ -436,7 +509,7 @@ function MakeWithConfig(Config) {
     };
   };
   let Api = {
-    Make: Make$7
+    Make: Make$8
   };
   let deploySchemaHashPrefix = "deploy-schema-hash:";
   let readSchemaHash = async (tableName, apiId) => {
@@ -476,6 +549,9 @@ function MakeWithConfig(Config) {
   let hooksApiRoleRef = {
     contents: undefined
   };
+  let hooksAdminApiRef = {
+    contents: undefined
+  };
   let resolveHookedApi = () => {
     let match = hooksApiRef.contents;
     if (match !== undefined) {
@@ -484,6 +560,42 @@ function MakeWithConfig(Config) {
       return resolveTargetApi();
     }
   };
+  let resolveAdminHookedApi = () => {
+    let match = hooksAdminApiRef.contents;
+    if (match !== undefined) {
+      return match.val;
+    } else {
+      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;
@@ -505,22 +617,68 @@ function MakeWithConfig(Config) {
   let hooks_preResolversSchemaHook = (name, version, pluginFragment) => {
     log.info("preResolversSchemaHook", undefined, `Pushing schema for plugin ` + name + `@` + version + ` to AppSync`);
     let capturedDeployTarget = currentDeployTarget.contents;
-    let match;
+    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: name,
+            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_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_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 = [
+      match$1 = [
         "deploy-schema:",
         domainApi
       ];
     } else {
-      let match$1 = apiConfigRef.contents;
-      let api = match$1 !== undefined ? match$1.platformApi : domainApi;
-      match = [
+      let match$2 = apiConfigRef.contents;
+      let api = match$2 !== undefined ? match$2.platformApi : domainApi;
+      match$1 = [
         "deploy-schema-platform:",
         api
       ];
     }
-    let targetApi = match[1];
-    let schemaPrefix = match[0];
+    let targetApi = match$1[1];
+    let schemaPrefix = match$1[0];
     let readStackRefString = (stackRef, key) => {
       let direct = stackRef.getOutput(key);
       let defaultOutput = stackRef.getOutput("default");
@@ -638,8 +796,10 @@ function MakeWithConfig(Config) {
       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);
-          let sdl = AppSync_Adapter$ReventlessAws.stampSharedIamTypes(GraphQL_Stitcher$ReventlessCore.stitch(baseFragment, allPluginFragments));
+          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();
@@ -685,8 +845,8 @@ function MakeWithConfig(Config) {
         Config.splitApi ? undefined : domainApi
       );
     if (targetApiOpt !== undefined) {
-      let adminBaseFragment = AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(Config.cloner), "Admin", undefined);
-      let sdl = AppSync_Adapter$ReventlessAws.stampSharedIamTypes(GraphQL_Stitcher$ReventlessCore.stitch(adminBaseFragment, []));
+      let adminBaseFragment = AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(Config.cloner), "Admin", AdminApi$ReventlessCore.systemCallerFieldNames);
+      let sdl = AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(adminBaseFragment, []);
       return Output$Pulumi.flatMap(Pulumi.all([
         targetApiOpt,
         adminBarrier
@@ -707,7 +867,7 @@ function MakeWithConfig(Config) {
     return adminBarrier;
   };
   let hooks_inboundAppSyncResolverHook = param => InboundTranslationResolvers_AppSync$ReventlessAws.make(resolveHookedApi(), param.runtime, param.fieldNames, param.opts);
-  let hooks_dcbAppSyncResolverHook = param => CommandGeneratorResolvers_AppSync$ReventlessAws.makeDcb(resolveHookedApi(), param.runtime, param.fieldNames, param.tags, param.opts);
+  let hooks_dcbAppSyncResolverHook = param => CommandGeneratorResolvers_AppSync$ReventlessAws.makeDcb(param.onAdminApi ? resolveAdminHookedApi() : resolveHookedApi(), param.runtime, param.fieldNames, param.tags, param.opts);
   let hooks_onDcbEventLogCreated = dcbEventLogUnknown => {
     if (DcbBackend$ReventlessAws.isPostgres()) {
       return;
@@ -760,6 +920,7 @@ function MakeWithConfig(Config) {
     schedulerRoleUrn: hooks_schedulerRoleUrn,
     api: hooksApiRef,
     apiRole: hooksApiRoleRef,
+    adminApi: hooksAdminApiRef,
     deployTarget: hooks_deployTarget
   };
   let PluginBuilderImpl = Plugin$ReventlessAws.Make({
@@ -823,20 +984,6 @@ function MakeWithConfig(Config) {
     authorization: PluginsReadModelSpec$ReventlessCore.authorization,
     visibility: PluginsReadModelSpec$ReventlessCore.visibility
   })(PluginReadModelMappings);
-  let UIFragmentRegistryReadModelMappings = {
-    moduleUrl: UIFragmentRegistryProjection$ReventlessCore.moduleUrl,
-    mappings: UIFragmentRegistryProjection$ReventlessCore.mappings
-  };
-  let UIFragmentRegistryReadModel = ReadModel_Builder_NoResolver_Stream$ReventlessAws.Make({
-    Id: Id$Reventless.$$String,
-    name: UIFragmentRegistryReadModelSpec$ReventlessCore.name,
-    moduleUrl: UIFragmentRegistryReadModelSpec$ReventlessCore.moduleUrl,
-    stateSchema: UIFragmentRegistryReadModelSpec$ReventlessCore.stateSchema,
-    config: UIFragmentRegistryReadModelSpec$ReventlessCore.config,
-    subIdConfig: undefined,
-    authorization: UIFragmentRegistryReadModelSpec$ReventlessCore.authorization,
-    visibility: UIFragmentRegistryReadModelSpec$ReventlessCore.visibility
-  })(UIFragmentRegistryReadModelMappings);
   let makeScheduler = () => {
     let component = Scheduler$ReventlessAws.make(undefined);
     let outputs = Component$ReventlessCore.outputs(component);
@@ -952,6 +1099,7 @@ function MakeWithConfig(Config) {
       ];
     let platformApiRole = match[1];
     let platformApi = match[0];
+    hooksAdminApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(platformApi);
     if (Config.splitApi) {
       splitApiOutputsRef.contents = {
         platformApi: platformApi,
@@ -967,10 +1115,13 @@ function MakeWithConfig(Config) {
         };
       }
     }
-    let admin = Admin.construct(version, [], [PluginAggregate], [
-      PluginReadModel,
-      UIFragmentRegistryReadModel
-    ], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [], [], [], [], []);
+    let admin = Admin.construct(version, [], [PluginAggregate], [PluginReadModel], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [
+      UiFragmentRegistrySlice,
+      ApiFragmentRegistrySlice
+    ], [
+      UiFragmentsViewSlice,
+      ApiFragmentsViewSlice
+    ], [], [], []);
     let pluginRm = admin.readModelsOutputs["Plugins"];
     if (pluginRm !== undefined) {
       let r = pluginRm.queryDb.resources[0];
@@ -979,11 +1130,18 @@ function MakeWithConfig(Config) {
         AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(r.name);
       }
     }
-    let rm = admin.readModelsOutputs["UIFragmentRegistry"];
+    let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
       let r$1 = rm.queryDb.resources[0];
       if (r$1 !== undefined) {
-        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, {});
+        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, admin.adminSchemaPushed, {});
+      }
+    }
+    let rm$1 = admin.stateViewSlicesOutputs["ApiFragments"];
+    if (rm$1 !== undefined) {
+      let r$2 = rm$1.queryDb.resources[0];
+      if (r$2 !== undefined) {
+        Platform_ApiFragments_Lambda$ReventlessAws.make(platformApi, r$2.name, admin.adminSchemaPushed, {});
       }
     }
     let pluginComponents = plugins.map(plugin => plugin.make());
@@ -1021,6 +1179,7 @@ function MakeWithConfig(Config) {
       ];
     let platformApiRole = match[1];
     let platformApi = match[0];
+    hooksAdminApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(platformApi);
     if (Config.splitApi) {
       splitApiOutputsRef.contents = {
         platformApi: platformApi,
@@ -1060,8 +1219,8 @@ function MakeWithConfig(Config) {
           return;
         }
       });
-      let baseFragment = Config.splitApi ? emptyBaseFragment : AppSync_Adapter$ReventlessAws.injectAwsAuthAll(AdminApi$ReventlessCore.baseFragment(Config.cloner), "Admin", undefined);
-      let sdl = AppSync_Adapter$ReventlessAws.stampSharedIamTypes(GraphQL_Stitcher$ReventlessCore.stitch(baseFragment, fragments));
+      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
@@ -1071,10 +1230,13 @@ function MakeWithConfig(Config) {
       updateApiSchema: updateApiSchema,
       manageSubscriptions: undefined
     });
-    let admin = Admin.construct(version, [PluginExtensionPoint], [PluginAggregate], [
-      PluginReadModel,
-      UIFragmentRegistryReadModel
-    ], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [], [], [], [], []);
+    let admin = Admin.construct(version, [PluginExtensionPoint], [PluginAggregate], [PluginReadModel], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [
+      UiFragmentRegistrySlice,
+      ApiFragmentRegistrySlice
+    ], [
+      UiFragmentsViewSlice,
+      ApiFragmentsViewSlice
+    ], [], [], []);
     let pluginRm = admin.readModelsOutputs["Plugins"];
     let pluginReadModelTableName;
     if (pluginRm !== undefined) {
@@ -1103,16 +1265,23 @@ function MakeWithConfig(Config) {
         return Pulumi.output("NOT_AVAILABLE");
       }
     });
-    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, pluginSchemaPersistenceTable.name, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, Config.cloner, undefined);
+    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, pluginSchemaPersistenceTable.name, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, Config.cloner, Output$Pulumi.flatMap(platformApi, api => api.id), Stdlib_Option.map(Stdlib_Option.flatMap(admin.stateViewSlicesOutputs["ApiFragments"], rm => rm.queryDb.resources[0]), r => r.name), AutomationSliceRuntime_Builder_Single$ReventlessAws.getDcbQueueUrl(), Config.splitApi, undefined);
     if (pluginReadModelTableName !== undefined) {
       AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(pluginReadModelTableName);
       Platform_ComponentDefinitions_Lambda$ReventlessAws.make(platformApi, pluginReadModelTableName, {});
     }
-    let rm = admin.readModelsOutputs["UIFragmentRegistry"];
+    let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
       let r$1 = rm.queryDb.resources[0];
       if (r$1 !== undefined) {
-        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, {});
+        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, admin.adminSchemaPushed, {});
+      }
+    }
+    let rm$1 = admin.stateViewSlicesOutputs["ApiFragments"];
+    if (rm$1 !== undefined) {
+      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) {
@@ -1321,7 +1490,7 @@ function MakeWithConfig(Config) {
     Counter: Counter,
     StateChangeSlice: StateChangeSlice,
     StateViewSlice: {
-      Make: include.Make
+      Make: Make$7
     },
     StateViewSliceStream: {
       Make: include$1.Make
@@ -1370,7 +1539,8 @@ function Make($star) {
       subnetIds: pg.subnetIds
     });
     QueryDbBackend$ReventlessAws.exempt(PluginsReadModelSpec$ReventlessCore.name);
-    QueryDbBackend$ReventlessAws.exempt(UIFragmentRegistryReadModelSpec$ReventlessCore.name);
+    QueryDbBackend$ReventlessAws.exempt(UiFragments$ReventlessCore.name);
+    QueryDbBackend$ReventlessAws.exempt(ApiFragments$ReventlessCore.name);
   });
   let currentDeployTarget = {
     contents: "Domain"
@@ -1640,17 +1810,79 @@ function Make($star) {
     MakeAsync: MakeAsync$1
   };
   let include = StateViewSlice_Builder$ReventlessAws.Make(ApiConfig);
+  let Make$8 = include.Make;
   let include$1 = StateViewSlice_Builder_Stream$ReventlessAws.Make(ApiConfig);
   let include$2 = AutomationSlice_Builder$ReventlessAws.Make(ApiConfig);
   let include$3 = OutboundTranslationSlice_Builder$ReventlessAws.Make(ApiConfig);
   let InboundTranslationSlice = InboundTranslationSlice_Builder$ReventlessAws.Make(ApiConfig);
+  let Spec = {
+    name: UiFragmentRegistry$ReventlessCore.name,
+    moduleUrl: UiFragmentRegistry$ReventlessCore.moduleUrl,
+    Id: Id$Reventless.$$String,
+    consumedEventSchema: UiFragmentRegistry$ReventlessCore.consumedEventSchema,
+    errorSchema: UiFragmentRegistry$ReventlessCore.errorSchema,
+    eventSchema: UiFragmentRegistry$ReventlessCore.eventSchema,
+    commandSchema: UiFragmentRegistry$ReventlessCore.commandSchema,
+    commandAuthorization: UiFragmentRegistry$ReventlessCore.commandAuthorization,
+    readConsistency: UiFragmentRegistry$ReventlessCore.readConsistency
+  };
+  let UiFragmentRegistrySlice = StateChangeSlice_Builder$ReventlessAws.Make(Spec)({
+    initialState: undefined,
+    evolve: UiFragmentRegistry_Behavior$ReventlessCore.evolve,
+    decide: UiFragmentRegistry_Behavior$ReventlessCore.decide,
+    moduleUrl: UiFragmentRegistry_Behavior$ReventlessCore.moduleUrl
+  });
+  let UiFragmentsViewSlice = Make$8({
+    name: UiFragments$ReventlessCore.name,
+    moduleUrl: UiFragments$ReventlessCore.moduleUrl,
+    stateSchema: UiFragments$ReventlessCore.stateSchema,
+    consumedEventSchema: UiFragments$ReventlessCore.consumedEventSchema,
+    config: UiFragments$ReventlessCore.config,
+    subIdConfig: undefined,
+    authorization: UiFragments$ReventlessCore.authorization,
+    visibility: UiFragments$ReventlessCore.visibility
+  })({
+    project: UiFragments_Projection$ReventlessCore.project,
+    moduleUrl: UiFragments_Projection$ReventlessCore.moduleUrl
+  });
+  let Spec$1 = {
+    name: ApiFragmentRegistry$ReventlessCore.name,
+    moduleUrl: ApiFragmentRegistry$ReventlessCore.moduleUrl,
+    Id: Id$Reventless.$$String,
+    consumedEventSchema: ApiFragmentRegistry$ReventlessCore.consumedEventSchema,
+    errorSchema: ApiFragmentRegistry$ReventlessCore.errorSchema,
+    eventSchema: ApiFragmentRegistry$ReventlessCore.eventSchema,
+    commandSchema: ApiFragmentRegistry$ReventlessCore.commandSchema,
+    commandAuthorization: ApiFragmentRegistry$ReventlessCore.commandAuthorization,
+    readConsistency: ApiFragmentRegistry$ReventlessCore.readConsistency
+  };
+  let ApiFragmentRegistrySlice = StateChangeSlice_Builder$ReventlessAws.Make(Spec$1)({
+    initialState: undefined,
+    evolve: ApiFragmentRegistry_Behavior$ReventlessCore.evolve,
+    decide: ApiFragmentRegistry_Behavior$ReventlessCore.decide,
+    moduleUrl: ApiFragmentRegistry_Behavior$ReventlessCore.moduleUrl
+  });
+  let ApiFragmentsViewSlice = Make$8({
+    name: ApiFragments$ReventlessCore.name,
+    moduleUrl: ApiFragments$ReventlessCore.moduleUrl,
+    stateSchema: ApiFragments$ReventlessCore.stateSchema,
+    consumedEventSchema: ApiFragments$ReventlessCore.consumedEventSchema,
+    config: ApiFragments$ReventlessCore.config,
+    subIdConfig: undefined,
+    authorization: ApiFragments$ReventlessCore.authorization,
+    visibility: ApiFragments$ReventlessCore.visibility
+  })({
+    project: ApiFragments_Projection$ReventlessCore.project,
+    moduleUrl: ApiFragments_Projection$ReventlessCore.moduleUrl
+  });
   let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
     types: [],
     mutations: [],
     queries: [],
-    subscriptions: []
+    subscriptions: [],
+    subscriptionSources: []
   });
-  let Make$8 = FragmentConfig => {
+  let Make$9 = FragmentConfig => {
     let Builder = Api_Builder$ReventlessCore.Make({
       makeApiResource: AppSync_Adapter$ReventlessAws.makeApiResource,
       generateFragment: AppSync_Adapter$ReventlessAws.generateFragment,
@@ -1662,7 +1894,7 @@ function Make($star) {
     };
   };
   let Api = {
-    Make: Make$8
+    Make: Make$9
   };
   let deploySchemaHashPrefix = "deploy-schema-hash:";
   let readSchemaHash = async (tableName, apiId) => {
@@ -1702,6 +1934,9 @@ function Make($star) {
   let hooksApiRoleRef = {
     contents: undefined
   };
+  let hooksAdminApiRef = {
+    contents: undefined
+  };
   let resolveHookedApi = () => {
     let match = hooksApiRef.contents;
     if (match !== undefined) {
@@ -1710,6 +1945,42 @@ function Make($star) {
       return resolveTargetApi();
     }
   };
+  let resolveAdminHookedApi = () => {
+    let match = hooksAdminApiRef.contents;
+    if (match !== undefined) {
+      return match.val;
+    } else {
+      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;
@@ -1731,22 +2002,68 @@ function Make($star) {
   let hooks_preResolversSchemaHook = (name, version, pluginFragment) => {
     log.info("preResolversSchemaHook", undefined, `Pushing schema for plugin ` + name + `@` + version + ` to AppSync`);
     let capturedDeployTarget = currentDeployTarget.contents;
-    let match;
+    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: name,
+            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_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_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 = [
+      match$1 = [
         "deploy-schema:",
         domainApi
       ];
     } else {
-      let match$1 = apiConfigRef.contents;
-      let api = match$1 !== undefined ? match$1.platformApi : domainApi;
-      match = [
+      let match$2 = apiConfigRef.contents;
+      let api = match$2 !== undefined ? match$2.platformApi : domainApi;
+      match$1 = [
         "deploy-schema-platform:",
         api
       ];
     }
-    let targetApi = match[1];
-    let schemaPrefix = match[0];
+    let targetApi = match$1[1];
+    let schemaPrefix = match$1[0];
     let readStackRefString = (stackRef, key) => {
       let direct = stackRef.getOutput(key);
       let defaultOutput = stackRef.getOutput("default");
@@ -1864,8 +2181,8 @@ function Make($star) {
       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", undefined);
-          let sdl = AppSync_Adapter$ReventlessAws.stampSharedIamTypes(GraphQL_Stitcher$ReventlessCore.stitch(baseFragment, allPluginFragments));
+          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();
@@ -1909,8 +2226,8 @@ function Make($star) {
     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", undefined);
-      let sdl = AppSync_Adapter$ReventlessAws.stampSharedIamTypes(GraphQL_Stitcher$ReventlessCore.stitch(adminBaseFragment, []));
+      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
@@ -1931,7 +2248,7 @@ function Make($star) {
     return adminBarrier;
   };
   let hooks_inboundAppSyncResolverHook = param => InboundTranslationResolvers_AppSync$ReventlessAws.make(resolveHookedApi(), param.runtime, param.fieldNames, param.opts);
-  let hooks_dcbAppSyncResolverHook = param => CommandGeneratorResolvers_AppSync$ReventlessAws.makeDcb(resolveHookedApi(), param.runtime, param.fieldNames, param.tags, param.opts);
+  let hooks_dcbAppSyncResolverHook = param => CommandGeneratorResolvers_AppSync$ReventlessAws.makeDcb(param.onAdminApi ? resolveAdminHookedApi() : resolveHookedApi(), param.runtime, param.fieldNames, param.tags, param.opts);
   let hooks_onDcbEventLogCreated = dcbEventLogUnknown => {
     if (DcbBackend$ReventlessAws.isPostgres()) {
       return;
@@ -1984,6 +2301,7 @@ function Make($star) {
     schedulerRoleUrn: hooks_schedulerRoleUrn,
     api: hooksApiRef,
     apiRole: hooksApiRoleRef,
+    adminApi: hooksAdminApiRef,
     deployTarget: hooks_deployTarget
   };
   let PluginBuilderImpl = Plugin$ReventlessAws.Make({
@@ -2047,20 +2365,6 @@ function Make($star) {
     authorization: PluginsReadModelSpec$ReventlessCore.authorization,
     visibility: PluginsReadModelSpec$ReventlessCore.visibility
   })(PluginReadModelMappings);
-  let UIFragmentRegistryReadModelMappings = {
-    moduleUrl: UIFragmentRegistryProjection$ReventlessCore.moduleUrl,
-    mappings: UIFragmentRegistryProjection$ReventlessCore.mappings
-  };
-  let UIFragmentRegistryReadModel = ReadModel_Builder_NoResolver_Stream$ReventlessAws.Make({
-    Id: Id$Reventless.$$String,
-    name: UIFragmentRegistryReadModelSpec$ReventlessCore.name,
-    moduleUrl: UIFragmentRegistryReadModelSpec$ReventlessCore.moduleUrl,
-    stateSchema: UIFragmentRegistryReadModelSpec$ReventlessCore.stateSchema,
-    config: UIFragmentRegistryReadModelSpec$ReventlessCore.config,
-    subIdConfig: undefined,
-    authorization: UIFragmentRegistryReadModelSpec$ReventlessCore.authorization,
-    visibility: UIFragmentRegistryReadModelSpec$ReventlessCore.visibility
-  })(UIFragmentRegistryReadModelMappings);
   let makeScheduler = () => {
     let component = Scheduler$ReventlessAws.make(undefined);
     let outputs = Component$ReventlessCore.outputs(component);
@@ -2173,6 +2477,7 @@ function Make($star) {
     let match = AppSync_Adapter$ReventlessAws.makeApiResource("PlatformApi", {});
     let platformApiRole = match[1];
     let platformApi = match[0];
+    hooksAdminApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(platformApi);
     splitApiOutputsRef.contents = {
       platformApi: platformApi,
       platformApiRole: platformApiRole
@@ -2186,10 +2491,13 @@ function Make($star) {
         platformApiRole: platformApiRole
       };
     }
-    let admin = Admin.construct(version, [], [PluginAggregate], [
-      PluginReadModel,
-      UIFragmentRegistryReadModel
-    ], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [], [], [], [], []);
+    let admin = Admin.construct(version, [], [PluginAggregate], [PluginReadModel], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [
+      UiFragmentRegistrySlice,
+      ApiFragmentRegistrySlice
+    ], [
+      UiFragmentsViewSlice,
+      ApiFragmentsViewSlice
+    ], [], [], []);
     let pluginRm = admin.readModelsOutputs["Plugins"];
     if (pluginRm !== undefined) {
       let r = pluginRm.queryDb.resources[0];
@@ -2198,11 +2506,18 @@ function Make($star) {
         AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(r.name);
       }
     }
-    let rm = admin.readModelsOutputs["UIFragmentRegistry"];
+    let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
       let r$1 = rm.queryDb.resources[0];
       if (r$1 !== undefined) {
-        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, {});
+        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, admin.adminSchemaPushed, {});
+      }
+    }
+    let rm$1 = admin.stateViewSlicesOutputs["ApiFragments"];
+    if (rm$1 !== undefined) {
+      let r$2 = rm$1.queryDb.resources[0];
+      if (r$2 !== undefined) {
+        Platform_ApiFragments_Lambda$ReventlessAws.make(platformApi, r$2.name, admin.adminSchemaPushed, {});
       }
     }
     let pluginComponents = plugins.map(plugin => plugin.make());
@@ -2231,6 +2546,7 @@ function Make($star) {
     let match = AppSync_Adapter$ReventlessAws.makeApiResource("PlatformApi", {});
     let platformApiRole = match[1];
     let platformApi = match[0];
+    hooksAdminApiRef.contents = Platform_Casts$ReventlessAws.wrapHookedValue(platformApi);
     splitApiOutputsRef.contents = {
       platformApi: platformApi,
       platformApiRole: platformApiRole
@@ -2268,7 +2584,7 @@ function Make($star) {
           return;
         }
       });
-      let sdl = AppSync_Adapter$ReventlessAws.stampSharedIamTypes(GraphQL_Stitcher$ReventlessCore.stitch(emptyBaseFragment, fragments));
+      let sdl = AppSync_Adapter$ReventlessAws.stitchWithAwsDirectives(emptyBaseFragment, fragments);
       return await AppSync_Adapter$ReventlessAws.startSchemaCreationRetrying(AppSync_Adapter$ReventlessAws.getClient(), {
         apiId: apiId,
         definition: sdl
@@ -2278,10 +2594,13 @@ function Make($star) {
       updateApiSchema: updateApiSchema,
       manageSubscriptions: undefined
     });
-    let admin = Admin.construct(version, [PluginExtensionPoint], [PluginAggregate], [
-      PluginReadModel,
-      UIFragmentRegistryReadModel
-    ], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [], [], [], [], []);
+    let admin = Admin.construct(version, [PluginExtensionPoint], [PluginAggregate], [PluginReadModel], scheduler, Util_ResourceNaming$ReventlessAws.operations, platformApi, platformApiRole, [
+      UiFragmentRegistrySlice,
+      ApiFragmentRegistrySlice
+    ], [
+      UiFragmentsViewSlice,
+      ApiFragmentsViewSlice
+    ], [], [], []);
     let pluginRm = admin.readModelsOutputs["Plugins"];
     let pluginReadModelTableName;
     if (pluginRm !== undefined) {
@@ -2310,16 +2629,23 @@ function Make($star) {
         return Pulumi.output("NOT_AVAILABLE");
       }
     });
-    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, pluginSchemaPersistenceTable.name, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, false, undefined);
+    PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, pluginSchemaPersistenceTable.name, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, false, Output$Pulumi.flatMap(platformApi, api => api.id), Stdlib_Option.map(Stdlib_Option.flatMap(admin.stateViewSlicesOutputs["ApiFragments"], rm => rm.queryDb.resources[0]), r => r.name), AutomationSliceRuntime_Builder_Single$ReventlessAws.getDcbQueueUrl(), true, undefined);
     if (pluginReadModelTableName !== undefined) {
       AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(pluginReadModelTableName);
       Platform_ComponentDefinitions_Lambda$ReventlessAws.make(platformApi, pluginReadModelTableName, {});
     }
-    let rm = admin.readModelsOutputs["UIFragmentRegistry"];
+    let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
       let r$1 = rm.queryDb.resources[0];
       if (r$1 !== undefined) {
-        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, {});
+        Platform_UIFragments_Lambda$ReventlessAws.make(platformApi, r$1.name, admin.adminSchemaPushed, {});
+      }
+    }
+    let rm$1 = admin.stateViewSlicesOutputs["ApiFragments"];
+    if (rm$1 !== undefined) {
+      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));
@@ -2511,7 +2837,7 @@ function Make($star) {
     return Pulumi$Pulumi.getOutputs();
   };
   let StateViewSlice = {
-    Make: include.Make
+    Make: Make$8
   };
   let StateViewSliceStream = {
     Make: include$1.Make