@reventlessdev/reventless-local 3.0.0-alpha.152 → 3.0.0-alpha.153

package/src/Platform.res.mjs

@@ -23,7 +23,6 @@ import * as LocalBus$ReventlessLocal from "./adapter/LocalBus.res.mjs";
 import * as Api_Naming$ReventlessCore from "@reventlessdev/reventless-core/src/components/Api/Api_Naming.res.mjs";
 import * as PluginSpec$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/lifecycle/PluginSpec.res.mjs";
 import * as UserStore$ReventlessLocal from "./adapter/Auth/UserStore.res.mjs";
-import * as Api_Builder$ReventlessCore from "@reventlessdev/reventless-core/src/components/Api/Api_Builder.res.mjs";
 import * as TestRunner$ReventlessLocal from "./test/TestRunner.res.mjs";
 import * as UiFragments$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UiFragmentRegistry/StateViewSlice/UiFragments.res.mjs";
 import * as CommandTopic$ReventlessCore from "@reventlessdev/reventless-core/src/components/CommandTopic/CommandTopic.res.mjs";
@@ -57,12 +56,9 @@ import * as PgProjectionCatchup$ReventlessLocal from "./adapter/PgProjectionCatc
 import * as PluginsReadModelSpec$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/lifecycle/PluginsReadModelSpec.res.mjs";
 import * as DomainGraphQL_Server$ReventlessLocal from "./adapter/DomainGraphQL_Server.res.mjs";
 import * as EventPublish_Callback$ReventlessCore from "@reventlessdev/reventless-core/src/components/EventLog/EventPublish_Callback.res.mjs";
-import * as LocalGraphQL_Adapter$ReventlessLocal from "./adapter/Api/LocalGraphQL_Adapter.res.mjs";
 import * as ProjectionCheckpoint$ReventlessLocal from "./adapter/ProjectionCheckpoint.res.mjs";
-import * as ApiFragmentsProjection$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/ApiFragmentsProjection.res.mjs";
 import * as ExtensionPointMapping$ReventlessInfra from "@reventlessdev/reventless-infra/src/types/ExtensionPointMapping.res.mjs";
 import * as UiFragments_Projection$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UiFragmentRegistry/StateViewSlice/UiFragments_Projection.res.mjs";
-import * as ApiFragmentRegistrySpec$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/ApiFragmentRegistrySpec.res.mjs";
 import * as EventLogStorage_Sqlite$ReventlessLocal from "./adapter/EventLog/EventLogStorage_Sqlite.res.mjs";
 import * as ExtensionPoint_Builder$ReventlessLocal from "./components/ExtensionPoint_Builder.res.mjs";
 import * as PlatformGraphQL_Server$ReventlessLocal from "./adapter/PlatformGraphQL_Server.res.mjs";
@@ -73,13 +69,10 @@ import * as LocalDcbEventLogStorage$ReventlessLocal from "./adapter/DcbEventLog/
 import * as LocalRuntimeEnvironment$ReventlessLocal from "./adapter/Runtime/LocalRuntimeEnvironment.res.mjs";
 import * as LocalScheduledPublisher$ReventlessLocal from "./adapter/Scheduler/LocalScheduledPublisher.res.mjs";
 import * as Platform_Admin_Structure$ReventlessCore from "@reventlessdev/reventless-core/src/admin/Platform_Admin_Structure.res.mjs";
-import * as Platform_ApiFragmentsApi$ReventlessCore from "@reventlessdev/reventless-core/src/admin/Platform_ApiFragmentsApi.res.mjs";
-import * as ApiFragmentsReadModelSpec$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/ApiFragmentsReadModelSpec.res.mjs";
 import * as LocalCommandTopicChannel$ReventlessLocal from "./adapter/CommandTopic/LocalCommandTopicChannel.res.mjs";
 import * as LocalEventTopicPublisher$ReventlessLocal from "./adapter/EventTopic/LocalEventTopicPublisher.res.mjs";
 import * as StateChangeSlice_Builder$ReventlessLocal from "./components/StateChangeSlice_Builder.res.mjs";
 import * as DcbEventLogStorage_Sqlite$ReventlessLocal from "./adapter/DcbEventLog/DcbEventLogStorage_Sqlite.res.mjs";
-import * as ApiFragmentRegistryBehavior$ReventlessCore from "@reventlessdev/reventless-core/src/admin/ApiFragmentRegistry/ApiFragmentRegistryBehavior.res.mjs";
 import * as LocalEventCollectorChannel$ReventlessLocal from "./adapter/EventCollector/LocalEventCollectorChannel.res.mjs";
 import * as PluginRuntime_Builder_Micro$ReventlessCore from "@reventlessdev/reventless-core/src/adapter/Runtime/PluginRuntime_Builder_Micro.res.mjs";
 import * as UiFragmentRegistry_Behavior$ReventlessCore from "@reventlessdev/reventless-core/src/admin/UiFragmentRegistry/StateChangeSlice/UiFragmentRegistry_Behavior.res.mjs";
@@ -122,14 +115,6 @@ function decodeUiFragmentRegistryEventEnvelope(eventJson) {
   }
 }
 
-function decodeApiFragmentRegistryEventEnvelope(eventJson) {
-  try {
-    return Stdlib_Option.map(Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(eventJson), d => d["event"]), payload => S.parseJsonOrThrow(payload, ApiFragmentRegistrySpec$ReventlessCore.eventSchema));
-  } catch (exn) {
-    return;
-  }
-}
-
 function MakeWithConfig(Config) {
   TestRunner$ReventlessLocal.setup();
   let match = Config.backend;
@@ -160,6 +145,22 @@ function MakeWithConfig(Config) {
   let currentDeployTarget = {
     contents: "Domain"
   };
+  let pluginScopeCounter = {
+    contents: 0
+  };
+  let buildPluginInScope = (makePlugin, builtInfos) => {
+    pluginScopeCounter.contents = pluginScopeCounter.contents + 1 | 0;
+    let scopeToken = `plugin-` + pluginScopeCounter.contents.toString();
+    DomainGraphQL_Server$ReventlessLocal.setScope(scopeToken);
+    let countBefore = builtInfos.contents.length;
+    let component = makePlugin();
+    let info = builtInfos.contents[countBefore];
+    if (info !== undefined) {
+      DomainGraphQL_Server$ReventlessLocal.relabelScope(scopeToken, info.name);
+    }
+    DomainGraphQL_Server$ReventlessLocal.resetScope();
+    return component;
+  };
   let adminRegisteredServers = {
     contents: []
   };
@@ -696,24 +697,6 @@ function MakeWithConfig(Config) {
   let InboundTranslationSlice = {
     Make: Make$11
   };
-  let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
-    types: [],
-    mutations: [],
-    queries: [],
-    subscriptions: [],
-    subscriptionSources: []
-  });
-  let Make$12 = FragmentConfig => {
-    let Builder = Api_Builder$ReventlessCore.Make(LocalGraphQL_Adapter$ReventlessLocal);
-    let effectiveBaseFragment = Config.splitApi ? emptyBaseFragment : FragmentConfig.baseFragment;
-    let make = (name, opts) => Builder.make(name, effectiveBaseFragment, opts);
-    return {
-      make: make
-    };
-  };
-  let Api = {
-    Make: Make$12
-  };
   let PluginMaker = Plugin_Builder$ReventlessLocal.Make(Bus)({
     hooks: hooks
   });
@@ -772,53 +755,8 @@ function MakeWithConfig(Config) {
     authorization: PluginsReadModelSpec$ReventlessCore.authorization,
     visibility: PluginsReadModelSpec$ReventlessCore.visibility
   })(PluginsReadModelMappings);
-  let $$let$3 = AggregateMaker.Make({
-    Id: Id$Reventless.$$String,
-    name: ApiFragmentRegistrySpec$ReventlessCore.name,
-    eventSchema: ApiFragmentRegistrySpec$ReventlessCore.eventSchema,
-    errorSchema: ApiFragmentRegistrySpec$ReventlessCore.errorSchema,
-    commandSchema: ApiFragmentRegistrySpec$ReventlessCore.commandSchema,
-    moduleUrl: ApiFragmentRegistrySpec$ReventlessCore.moduleUrl,
-    commandAuthorization: ApiFragmentRegistrySpec$ReventlessCore.commandAuthorization
-  })({
-    initialState: ApiFragmentRegistryBehavior$ReventlessCore.initialState,
-    evolve: ApiFragmentRegistryBehavior$ReventlessCore.evolve,
-    decide: ApiFragmentRegistryBehavior$ReventlessCore.decide,
-    snapshot: undefined,
-    moduleUrl: ApiFragmentRegistryBehavior$ReventlessCore.moduleUrl
-  })(NoEventMappings$ReventlessInfra.Make({
-    name: ApiFragmentRegistrySpec$ReventlessCore.name,
-    Id: Id$Reventless.$$String,
-    commandSchema: ApiFragmentRegistrySpec$ReventlessCore.commandSchema
-  }));
-  let LocalApiFragmentRegistryAggregate_Spec = $$let$3.Spec;
-  let LocalApiFragmentRegistryAggregate_make = $$let$3.make;
-  let LocalApiFragmentRegistryAggregate_outputs = $$let$3.outputs;
-  let LocalApiFragmentRegistryAggregate_operations = $$let$3.operations;
-  let LocalApiFragmentRegistryAggregate_finish = $$let$3.finish;
-  let LocalApiFragmentRegistryAggregate = {
-    Spec: LocalApiFragmentRegistryAggregate_Spec,
-    make: LocalApiFragmentRegistryAggregate_make,
-    outputs: LocalApiFragmentRegistryAggregate_outputs,
-    operations: LocalApiFragmentRegistryAggregate_operations,
-    finish: LocalApiFragmentRegistryAggregate_finish
-  };
-  let ApiFragmentsReadModelMappings = {
-    moduleUrl: ApiFragmentsProjection$ReventlessCore.moduleUrl,
-    mappings: ApiFragmentsProjection$ReventlessCore.mappings
-  };
-  let ApiFragmentsReadModel = ReadModelMaker.MakeNoResolver({
-    Id: Id$Reventless.$$String,
-    name: ApiFragmentsReadModelSpec$ReventlessCore.name,
-    moduleUrl: ApiFragmentsReadModelSpec$ReventlessCore.moduleUrl,
-    stateSchema: ApiFragmentsReadModelSpec$ReventlessCore.stateSchema,
-    config: ApiFragmentsReadModelSpec$ReventlessCore.config,
-    subIdConfig: undefined,
-    authorization: ApiFragmentsReadModelSpec$ReventlessCore.authorization,
-    visibility: ApiFragmentsReadModelSpec$ReventlessCore.visibility
-  })(ApiFragmentsReadModelMappings);
+  let $$let$3 = LocalCommandTopicChannel$ReventlessLocal.Make(Bus);
   let $$let$4 = LocalCommandTopicChannel$ReventlessLocal.Make(Bus);
-  let $$let$5 = LocalCommandTopicChannel$ReventlessLocal.Make(Bus);
   let Admin = Platform_Admin$ReventlessCore.Make({
     make: LocalRuntimeEnvironment$ReventlessLocal.make,
     groupBySource: LocalRuntimeEnvironment$ReventlessLocal.groupBySource,
@@ -834,9 +772,9 @@ function MakeWithConfig(Config) {
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })(EventCollectorChannel))(LocalDcbEventLogStorage$ReventlessLocal.Make(Bus))(LocalEventTopicPublisher$ReventlessLocal.Make(Bus))({
-    make: $$let$4.make
+    make: $$let$3.make
   })({
-    make: $$let$5.make
+    make: $$let$4.make
   })({
     silent: Config.silent,
     splitApi: Config.splitApi,
@@ -897,31 +835,6 @@ function MakeWithConfig(Config) {
     };
     return Bus.dispatchCommand(adminDcbCmdTopicKey, CommandTopic$ReventlessCore.encodeCommandJson(cmdJson));
   };
-  let apiFragmentRegistryCmdTopicKey = ApiFragmentRegistrySpec$ReventlessCore.name + "AggrCmdTopic";
-  let apiFragmentRegistryEventTopicKey = ApiFragmentRegistrySpec$ReventlessCore.name + "AggrEventTopic";
-  let dispatchApiFragmentCommand = command => {
-    let cmdJson_meta = Message$ReventlessCore.generateMeta(ApiFragmentRegistrySpec$ReventlessCore.name, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
-    let cmdJson_commandJson = S.reverseConvertToJsonOrThrow(command, ApiFragmentRegistrySpec$ReventlessCore.commandSchema);
-    let cmdJson = {
-      id: "registry",
-      meta: cmdJson_meta,
-      commandJson: cmdJson_commandJson
-    };
-    return Bus.dispatchCommand(apiFragmentRegistryCmdTopicKey, CommandTopic$ReventlessCore.encodeCommandJson(cmdJson));
-  };
-  let apiFragmentsQueryResolver = async (_root, _args, _ctx) => {
-    let scanAll = Bus.getQueryDbScan(ApiFragmentsReadModelSpec$ReventlessCore.name);
-    let items = scanAll !== undefined ? scanAll() : [];
-    return Stdlib_Array.filterMap(items, item => {
-      let state;
-      try {
-        state = S.parseOrThrow(item, ApiFragmentsReadModelSpec$ReventlessCore.stateSchema);
-      } catch (exn) {
-        return;
-      }
-      return Platform_ApiFragmentsApi$ReventlessCore.encodeApiFragmentEntry(state);
-    });
-  };
   let pluginStatusSubTopic = "onPluginStatusChange";
   let uiFragmentSubTopic = "onUIFragmentChange";
   let adminDcbEventTopicKey = ComponentType$ReventlessCore.name("Admin", "EventTopic");
@@ -994,26 +907,6 @@ function MakeWithConfig(Config) {
           return publishUIFragment(match.pluginId, "Deregistered", null);
       }
     });
-    Bus.subscribeToEvents(apiFragmentRegistryEventTopicKey, async (_service, _meta, eventJson) => {
-      let match = decodeApiFragmentRegistryEventEnvelope(eventJson);
-      if (match === undefined) {
-        return;
-      }
-      switch (match.TAG) {
-        case "ApiFragmentRegistered" :
-        case "ApiFragmentUpdated" :
-          break;
-        default:
-          return;
-      }
-      dispatchApiFragmentCommand({
-        TAG: "RecordApiFragmentPush",
-        pluginId: match.pluginId,
-        ok: true,
-        message: "",
-        at: new Date().toISOString()
-      });
-    });
   };
   let connectPlugin = pluginComponents => {
     pluginComponents.forEach(plugin => {
@@ -1029,7 +922,6 @@ function MakeWithConfig(Config) {
         outputs.pluginStructure
       ]).apply(param => {
         let uiFragments = param[6];
-        let apiSchemaFragment = param[5];
         let id = param[0];
         let pluginName = Stdlib_Option.getOr(id.split("@")[0], id);
         let pluginDefinition = {
@@ -1054,7 +946,7 @@ function MakeWithConfig(Config) {
           }),
           eventCollector: param[2].name,
           extensionProtocols: [],
-          apiSchemaFragment: apiSchemaFragment,
+          apiSchemaFragment: param[5],
           apiTarget: undefined,
           structure: param[7],
           dcbEventLog: undefined,
@@ -1071,15 +963,6 @@ function MakeWithConfig(Config) {
             manifest: uiFragments,
             at: new Date().toISOString()
           });
-        }
-        if (apiSchemaFragment !== undefined) {
-          dispatchApiFragmentCommand({
-            TAG: "RegisterApiFragment",
-            pluginId: pluginName,
-            fragment: apiSchemaFragment,
-            apiTarget: "Domain",
-            at: new Date().toISOString()
-          });
           return;
         }
       });
@@ -1287,11 +1170,7 @@ function MakeWithConfig(Config) {
     hooks_apiRole.contents = {
       val: undefined
     };
-    let admin = Admin.construct(version, [], [
-      LocalPluginAggregate,
-      LocalApiFragmentRegistryAggregate
-    ], [
-      {
+    let admin = Admin.construct(version, [], [LocalPluginAggregate], [{
         Spec: PluginsReadModel.Spec,
         sourceNames: PluginsReadModel.sourceNames,
         consumedEventNames: PluginsReadModel.consumedEventNames,
@@ -1299,17 +1178,7 @@ function MakeWithConfig(Config) {
         outputs: PluginsReadModel.outputs,
         operations: PluginsReadModel.operations,
         finish: PluginsReadModel.finish
-      },
-      {
-        Spec: ApiFragmentsReadModel.Spec,
-        sourceNames: ApiFragmentsReadModel.sourceNames,
-        consumedEventNames: ApiFragmentsReadModel.consumedEventNames,
-        make: ApiFragmentsReadModel.make,
-        outputs: ApiFragmentsReadModel.outputs,
-        operations: ApiFragmentsReadModel.operations,
-        finish: ApiFragmentsReadModel.finish
-      }
-    ], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
+      }], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     hooks_adminExtensionPoints.contents = admin.extensionPointsOutputs.apply(eps => Object.fromEntries(eps.map(ep => [
       ep.name,
       ep
@@ -1323,7 +1192,7 @@ function MakeWithConfig(Config) {
       Stdlib_Option.forEach(existingBuiltHook, h => h(info));
       builtInfos.contents.push(info);
     });
-    let plugins$1 = plugins.map(plugin => plugin.make());
+    let plugins$1 = plugins.map(plugin => buildPluginInScope(plugin.make, builtInfos));
     Plugin_Helpers$ReventlessCore.onPluginBuiltHook.contents = existingBuiltHook;
     let allPluginOutputs = plugins$1.map(Component$ReventlessCore.outputs);
     firePluginDeployedHooks(builtInfos.contents, allPluginOutputs);
@@ -1518,7 +1387,6 @@ function MakeWithConfig(Config) {
       });
       return Object.values(latestByName).map(param => Platform_UIFragmentsApi$ReventlessCore.encodeUIFragmentEntry(param[1]));
     };
-    queryResolvers["Platform_ApiFragments"] = apiFragmentsQueryResolver;
     registerAdminItemsAndIndexResolvers(queryResolvers, true);
     platformGraphQL.registerQueries(baseParts.queries, queryResolvers);
     let argId = args => Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(args), d => d["id"]), Stdlib_JSON.Decode.string), "");
@@ -1681,15 +1549,7 @@ function MakeWithConfig(Config) {
     hooks_apiRole.contents = {
       val: undefined
     };
-    Admin.construct(version, [], [LocalApiFragmentRegistryAggregate], [{
-        Spec: ApiFragmentsReadModel.Spec,
-        sourceNames: ApiFragmentsReadModel.sourceNames,
-        consumedEventNames: ApiFragmentsReadModel.consumedEventNames,
-        make: ApiFragmentsReadModel.make,
-        outputs: ApiFragmentsReadModel.outputs,
-        operations: ApiFragmentsReadModel.operations,
-        finish: ApiFragmentsReadModel.finish
-      }], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
+    Admin.construct(version, [], [], [], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     currentDeployTarget.contents = "Platform";
     let adminGraphQL = resolveTargetGraphQL();
     let adminMCP = resolveTargetMCP();
@@ -1700,7 +1560,6 @@ function MakeWithConfig(Config) {
     queryResolvers[adminQueryEntry.singleFieldName] = async (_root, _args, _ctx) => null;
     queryResolvers[adminQueryEntry.listFieldName] = async (_root, _args, _ctx) => connectionResponse([]);
     queryResolvers["Platform_UIFragments"] = async (_root, _args, _ctx) => [];
-    queryResolvers["Platform_ApiFragments"] = apiFragmentsQueryResolver;
     registerAdminItemsAndIndexResolvers(queryResolvers, false);
     adminGraphQL.registerQueries(baseParts.queries, queryResolvers);
     let mutationResolvers = {};
@@ -1788,11 +1647,7 @@ function MakeWithConfig(Config) {
     hooks_apiRole.contents = {
       val: undefined
     };
-    let admin = Admin.construct("", [], [
-      LocalPluginAggregate,
-      LocalApiFragmentRegistryAggregate
-    ], [
-      {
+    let admin = Admin.construct("", [], [LocalPluginAggregate], [{
         Spec: PluginsReadModel.Spec,
         sourceNames: PluginsReadModel.sourceNames,
         consumedEventNames: PluginsReadModel.consumedEventNames,
@@ -1800,17 +1655,7 @@ function MakeWithConfig(Config) {
         outputs: PluginsReadModel.outputs,
         operations: PluginsReadModel.operations,
         finish: PluginsReadModel.finish
-      },
-      {
-        Spec: ApiFragmentsReadModel.Spec,
-        sourceNames: ApiFragmentsReadModel.sourceNames,
-        consumedEventNames: ApiFragmentsReadModel.consumedEventNames,
-        make: ApiFragmentsReadModel.make,
-        outputs: ApiFragmentsReadModel.outputs,
-        operations: ApiFragmentsReadModel.operations,
-        finish: ApiFragmentsReadModel.finish
-      }
-    ], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
+      }], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     hooks_adminExtensionPoints.contents = admin.extensionPointsOutputs.apply(eps => Object.fromEntries(eps.map(ep => [
       ep.name,
       ep
@@ -1823,7 +1668,7 @@ function MakeWithConfig(Config) {
       Stdlib_Option.forEach(existingBuiltHook, h => h(info));
       builtInfos.contents.push(info);
     });
-    let pluginComponent = plugin.make();
+    let pluginComponent = buildPluginInScope(plugin.make, builtInfos);
     Plugin_Helpers$ReventlessCore.onPluginBuiltHook.contents = existingBuiltHook;
     let adminGraphQL = resolveTargetGraphQL();
     if (!adminRegisteredServers.contents.some(s => s === adminGraphQL)) {
@@ -1846,7 +1691,6 @@ function MakeWithConfig(Config) {
           return Platform_UIFragmentsApi$ReventlessCore.encodeUIFragmentEntry(state);
         });
       };
-      queryResolvers["Platform_ApiFragments"] = apiFragmentsQueryResolver;
       queryResolvers["Platform_ComponentDefinitions"] = async (_root, _args, _ctx) => Object.entries(pluginStructuresStore.contents).map(param => Platform_ComponentDefinitionsApi$ReventlessCore.encodePluginStructureEntry(param[0], param[1]));
       registerAdminItemsAndIndexResolvers(queryResolvers, true);
       adminGraphQL.registerQueries(baseParts.queries, queryResolvers);
@@ -1931,7 +1775,6 @@ function MakeWithConfig(Config) {
     AutomationSlice: AutomationSlice,
     OutboundTranslationSlice: OutboundTranslationSlice,
     InboundTranslationSlice: InboundTranslationSlice,
-    Api: Api,
     mcpSupported: true,
     Plugin: Plugin,
     makePlatform: makePlatform,
@@ -1971,6 +1814,22 @@ function Make($star) {
   let currentDeployTarget = {
     contents: "Domain"
   };
+  let pluginScopeCounter = {
+    contents: 0
+  };
+  let buildPluginInScope = (makePlugin, builtInfos) => {
+    pluginScopeCounter.contents = pluginScopeCounter.contents + 1 | 0;
+    let scopeToken = `plugin-` + pluginScopeCounter.contents.toString();
+    DomainGraphQL_Server$ReventlessLocal.setScope(scopeToken);
+    let countBefore = builtInfos.contents.length;
+    let component = makePlugin();
+    let info = builtInfos.contents[countBefore];
+    if (info !== undefined) {
+      DomainGraphQL_Server$ReventlessLocal.relabelScope(scopeToken, info.name);
+    }
+    DomainGraphQL_Server$ReventlessLocal.resetScope();
+    return component;
+  };
   let adminRegisteredServers = {
     contents: []
   };
@@ -2501,23 +2360,6 @@ function Make($star) {
   let InboundTranslationSlice = {
     Make: Make$12
   };
-  let emptyBaseFragment = GraphQL_Stitcher$ReventlessCore.encode({
-    types: [],
-    mutations: [],
-    queries: [],
-    subscriptions: [],
-    subscriptionSources: []
-  });
-  let Make$13 = FragmentConfig => {
-    let Builder = Api_Builder$ReventlessCore.Make(LocalGraphQL_Adapter$ReventlessLocal);
-    let make = (name, opts) => Builder.make(name, emptyBaseFragment, opts);
-    return {
-      make: make
-    };
-  };
-  let Api = {
-    Make: Make$13
-  };
   let PluginMaker = Plugin_Builder$ReventlessLocal.Make(Bus)({
     hooks: hooks
   });
@@ -2576,53 +2418,8 @@ function Make($star) {
     authorization: PluginsReadModelSpec$ReventlessCore.authorization,
     visibility: PluginsReadModelSpec$ReventlessCore.visibility
   })(PluginsReadModelMappings);
-  let $$let$3 = AggregateMaker.Make({
-    Id: Id$Reventless.$$String,
-    name: ApiFragmentRegistrySpec$ReventlessCore.name,
-    eventSchema: ApiFragmentRegistrySpec$ReventlessCore.eventSchema,
-    errorSchema: ApiFragmentRegistrySpec$ReventlessCore.errorSchema,
-    commandSchema: ApiFragmentRegistrySpec$ReventlessCore.commandSchema,
-    moduleUrl: ApiFragmentRegistrySpec$ReventlessCore.moduleUrl,
-    commandAuthorization: ApiFragmentRegistrySpec$ReventlessCore.commandAuthorization
-  })({
-    initialState: ApiFragmentRegistryBehavior$ReventlessCore.initialState,
-    evolve: ApiFragmentRegistryBehavior$ReventlessCore.evolve,
-    decide: ApiFragmentRegistryBehavior$ReventlessCore.decide,
-    snapshot: undefined,
-    moduleUrl: ApiFragmentRegistryBehavior$ReventlessCore.moduleUrl
-  })(NoEventMappings$ReventlessInfra.Make({
-    name: ApiFragmentRegistrySpec$ReventlessCore.name,
-    Id: Id$Reventless.$$String,
-    commandSchema: ApiFragmentRegistrySpec$ReventlessCore.commandSchema
-  }));
-  let LocalApiFragmentRegistryAggregate_Spec = $$let$3.Spec;
-  let LocalApiFragmentRegistryAggregate_make = $$let$3.make;
-  let LocalApiFragmentRegistryAggregate_outputs = $$let$3.outputs;
-  let LocalApiFragmentRegistryAggregate_operations = $$let$3.operations;
-  let LocalApiFragmentRegistryAggregate_finish = $$let$3.finish;
-  let LocalApiFragmentRegistryAggregate = {
-    Spec: LocalApiFragmentRegistryAggregate_Spec,
-    make: LocalApiFragmentRegistryAggregate_make,
-    outputs: LocalApiFragmentRegistryAggregate_outputs,
-    operations: LocalApiFragmentRegistryAggregate_operations,
-    finish: LocalApiFragmentRegistryAggregate_finish
-  };
-  let ApiFragmentsReadModelMappings = {
-    moduleUrl: ApiFragmentsProjection$ReventlessCore.moduleUrl,
-    mappings: ApiFragmentsProjection$ReventlessCore.mappings
-  };
-  let ApiFragmentsReadModel = ReadModelMaker.MakeNoResolver({
-    Id: Id$Reventless.$$String,
-    name: ApiFragmentsReadModelSpec$ReventlessCore.name,
-    moduleUrl: ApiFragmentsReadModelSpec$ReventlessCore.moduleUrl,
-    stateSchema: ApiFragmentsReadModelSpec$ReventlessCore.stateSchema,
-    config: ApiFragmentsReadModelSpec$ReventlessCore.config,
-    subIdConfig: undefined,
-    authorization: ApiFragmentsReadModelSpec$ReventlessCore.authorization,
-    visibility: ApiFragmentsReadModelSpec$ReventlessCore.visibility
-  })(ApiFragmentsReadModelMappings);
+  let $$let$3 = LocalCommandTopicChannel$ReventlessLocal.Make(Bus);
   let $$let$4 = LocalCommandTopicChannel$ReventlessLocal.Make(Bus);
-  let $$let$5 = LocalCommandTopicChannel$ReventlessLocal.Make(Bus);
   let Admin = Platform_Admin$ReventlessCore.Make({
     make: LocalRuntimeEnvironment$ReventlessLocal.make,
     groupBySource: LocalRuntimeEnvironment$ReventlessLocal.groupBySource,
@@ -2638,9 +2435,9 @@ function Make($star) {
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })(EventCollectorChannel))(LocalDcbEventLogStorage$ReventlessLocal.Make(Bus))(LocalEventTopicPublisher$ReventlessLocal.Make(Bus))({
-    make: $$let$4.make
+    make: $$let$3.make
   })({
-    make: $$let$5.make
+    make: $$let$4.make
   })({
     silent: false,
     splitApi: true,
@@ -2701,31 +2498,6 @@ function Make($star) {
     };
     return Bus.dispatchCommand(adminDcbCmdTopicKey, CommandTopic$ReventlessCore.encodeCommandJson(cmdJson));
   };
-  let apiFragmentRegistryCmdTopicKey = ApiFragmentRegistrySpec$ReventlessCore.name + "AggrCmdTopic";
-  let apiFragmentRegistryEventTopicKey = ApiFragmentRegistrySpec$ReventlessCore.name + "AggrEventTopic";
-  let dispatchApiFragmentCommand = command => {
-    let cmdJson_meta = Message$ReventlessCore.generateMeta(ApiFragmentRegistrySpec$ReventlessCore.name, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
-    let cmdJson_commandJson = S.reverseConvertToJsonOrThrow(command, ApiFragmentRegistrySpec$ReventlessCore.commandSchema);
-    let cmdJson = {
-      id: "registry",
-      meta: cmdJson_meta,
-      commandJson: cmdJson_commandJson
-    };
-    return Bus.dispatchCommand(apiFragmentRegistryCmdTopicKey, CommandTopic$ReventlessCore.encodeCommandJson(cmdJson));
-  };
-  let apiFragmentsQueryResolver = async (_root, _args, _ctx) => {
-    let scanAll = Bus.getQueryDbScan(ApiFragmentsReadModelSpec$ReventlessCore.name);
-    let items = scanAll !== undefined ? scanAll() : [];
-    return Stdlib_Array.filterMap(items, item => {
-      let state;
-      try {
-        state = S.parseOrThrow(item, ApiFragmentsReadModelSpec$ReventlessCore.stateSchema);
-      } catch (exn) {
-        return;
-      }
-      return Platform_ApiFragmentsApi$ReventlessCore.encodeApiFragmentEntry(state);
-    });
-  };
   let pluginStatusSubTopic = "onPluginStatusChange";
   let uiFragmentSubTopic = "onUIFragmentChange";
   let adminDcbEventTopicKey = ComponentType$ReventlessCore.name("Admin", "EventTopic");
@@ -2798,26 +2570,6 @@ function Make($star) {
           return publishUIFragment(match.pluginId, "Deregistered", null);
       }
     });
-    Bus.subscribeToEvents(apiFragmentRegistryEventTopicKey, async (_service, _meta, eventJson) => {
-      let match = decodeApiFragmentRegistryEventEnvelope(eventJson);
-      if (match === undefined) {
-        return;
-      }
-      switch (match.TAG) {
-        case "ApiFragmentRegistered" :
-        case "ApiFragmentUpdated" :
-          break;
-        default:
-          return;
-      }
-      dispatchApiFragmentCommand({
-        TAG: "RecordApiFragmentPush",
-        pluginId: match.pluginId,
-        ok: true,
-        message: "",
-        at: new Date().toISOString()
-      });
-    });
   };
   let connectPlugin = pluginComponents => {
     pluginComponents.forEach(plugin => {
@@ -2833,7 +2585,6 @@ function Make($star) {
         outputs.pluginStructure
       ]).apply(param => {
         let uiFragments = param[6];
-        let apiSchemaFragment = param[5];
         let id = param[0];
         let pluginName = Stdlib_Option.getOr(id.split("@")[0], id);
         let pluginDefinition = {
@@ -2858,7 +2609,7 @@ function Make($star) {
           }),
           eventCollector: param[2].name,
           extensionProtocols: [],
-          apiSchemaFragment: apiSchemaFragment,
+          apiSchemaFragment: param[5],
           apiTarget: undefined,
           structure: param[7],
           dcbEventLog: undefined,
@@ -2875,15 +2626,6 @@ function Make($star) {
             manifest: uiFragments,
             at: new Date().toISOString()
           });
-        }
-        if (apiSchemaFragment !== undefined) {
-          dispatchApiFragmentCommand({
-            TAG: "RegisterApiFragment",
-            pluginId: pluginName,
-            fragment: apiSchemaFragment,
-            apiTarget: "Domain",
-            at: new Date().toISOString()
-          });
           return;
         }
       });
@@ -3086,11 +2828,7 @@ function Make($star) {
     hooks_apiRole.contents = {
       val: undefined
     };
-    let admin = Admin.construct(version, [], [
-      LocalPluginAggregate,
-      LocalApiFragmentRegistryAggregate
-    ], [
-      {
+    let admin = Admin.construct(version, [], [LocalPluginAggregate], [{
         Spec: PluginsReadModel.Spec,
         sourceNames: PluginsReadModel.sourceNames,
         consumedEventNames: PluginsReadModel.consumedEventNames,
@@ -3098,17 +2836,7 @@ function Make($star) {
         outputs: PluginsReadModel.outputs,
         operations: PluginsReadModel.operations,
         finish: PluginsReadModel.finish
-      },
-      {
-        Spec: ApiFragmentsReadModel.Spec,
-        sourceNames: ApiFragmentsReadModel.sourceNames,
-        consumedEventNames: ApiFragmentsReadModel.consumedEventNames,
-        make: ApiFragmentsReadModel.make,
-        outputs: ApiFragmentsReadModel.outputs,
-        operations: ApiFragmentsReadModel.operations,
-        finish: ApiFragmentsReadModel.finish
-      }
-    ], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
+      }], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     hooks_adminExtensionPoints.contents = admin.extensionPointsOutputs.apply(eps => Object.fromEntries(eps.map(ep => [
       ep.name,
       ep
@@ -3122,7 +2850,7 @@ function Make($star) {
       Stdlib_Option.forEach(existingBuiltHook, h => h(info));
       builtInfos.contents.push(info);
     });
-    let plugins$1 = plugins.map(plugin => plugin.make());
+    let plugins$1 = plugins.map(plugin => buildPluginInScope(plugin.make, builtInfos));
     Plugin_Helpers$ReventlessCore.onPluginBuiltHook.contents = existingBuiltHook;
     let allPluginOutputs = plugins$1.map(Component$ReventlessCore.outputs);
     firePluginDeployedHooks(builtInfos.contents, allPluginOutputs);
@@ -3317,7 +3045,6 @@ function Make($star) {
       });
       return Object.values(latestByName).map(param => Platform_UIFragmentsApi$ReventlessCore.encodeUIFragmentEntry(param[1]));
     };
-    queryResolvers["Platform_ApiFragments"] = apiFragmentsQueryResolver;
     registerAdminItemsAndIndexResolvers(queryResolvers, true);
     platformGraphQL.registerQueries(baseParts.queries, queryResolvers);
     let argId = args => Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(args), d => d["id"]), Stdlib_JSON.Decode.string), "");
@@ -3473,15 +3200,7 @@ function Make($star) {
     hooks_apiRole.contents = {
       val: undefined
     };
-    Admin.construct(version, [], [LocalApiFragmentRegistryAggregate], [{
-        Spec: ApiFragmentsReadModel.Spec,
-        sourceNames: ApiFragmentsReadModel.sourceNames,
-        consumedEventNames: ApiFragmentsReadModel.consumedEventNames,
-        make: ApiFragmentsReadModel.make,
-        outputs: ApiFragmentsReadModel.outputs,
-        operations: ApiFragmentsReadModel.operations,
-        finish: ApiFragmentsReadModel.finish
-      }], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
+    Admin.construct(version, [], [], [], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     currentDeployTarget.contents = "Platform";
     let adminGraphQL = resolveTargetGraphQL();
     let adminMCP = resolveTargetMCP();
@@ -3492,7 +3211,6 @@ function Make($star) {
     queryResolvers[adminQueryEntry.singleFieldName] = async (_root, _args, _ctx) => null;
     queryResolvers[adminQueryEntry.listFieldName] = async (_root, _args, _ctx) => connectionResponse([]);
     queryResolvers["Platform_UIFragments"] = async (_root, _args, _ctx) => [];
-    queryResolvers["Platform_ApiFragments"] = apiFragmentsQueryResolver;
     registerAdminItemsAndIndexResolvers(queryResolvers, false);
     adminGraphQL.registerQueries(baseParts.queries, queryResolvers);
     let mutationResolvers = {};
@@ -3578,11 +3296,7 @@ function Make($star) {
     hooks_apiRole.contents = {
       val: undefined
     };
-    let admin = Admin.construct("", [], [
-      LocalPluginAggregate,
-      LocalApiFragmentRegistryAggregate
-    ], [
-      {
+    let admin = Admin.construct("", [], [LocalPluginAggregate], [{
         Spec: PluginsReadModel.Spec,
         sourceNames: PluginsReadModel.sourceNames,
         consumedEventNames: PluginsReadModel.consumedEventNames,
@@ -3590,17 +3304,7 @@ function Make($star) {
         outputs: PluginsReadModel.outputs,
         operations: PluginsReadModel.operations,
         finish: PluginsReadModel.finish
-      },
-      {
-        Spec: ApiFragmentsReadModel.Spec,
-        sourceNames: ApiFragmentsReadModel.sourceNames,
-        consumedEventNames: ApiFragmentsReadModel.consumedEventNames,
-        make: ApiFragmentsReadModel.make,
-        outputs: ApiFragmentsReadModel.outputs,
-        operations: ApiFragmentsReadModel.operations,
-        finish: ApiFragmentsReadModel.finish
-      }
-    ], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
+      }], scheduler, LocalPluginSpec$ReventlessLocal.resourceNaming, undefined, undefined, [UiFragmentRegistrySlice], [UiFragmentsViewSlice], [], [], []);
     hooks_adminExtensionPoints.contents = admin.extensionPointsOutputs.apply(eps => Object.fromEntries(eps.map(ep => [
       ep.name,
       ep
@@ -3613,7 +3317,7 @@ function Make($star) {
       Stdlib_Option.forEach(existingBuiltHook, h => h(info));
       builtInfos.contents.push(info);
     });
-    let pluginComponent = plugin.make();
+    let pluginComponent = buildPluginInScope(plugin.make, builtInfos);
     Plugin_Helpers$ReventlessCore.onPluginBuiltHook.contents = existingBuiltHook;
     let adminGraphQL = resolveTargetGraphQL();
     if (!adminRegisteredServers.contents.some(s => s === adminGraphQL)) {
@@ -3636,7 +3340,6 @@ function Make($star) {
           return Platform_UIFragmentsApi$ReventlessCore.encodeUIFragmentEntry(state);
         });
       };
-      queryResolvers["Platform_ApiFragments"] = apiFragmentsQueryResolver;
       queryResolvers["Platform_ComponentDefinitions"] = async (_root, _args, _ctx) => Object.entries(pluginStructuresStore.contents).map(param => Platform_ComponentDefinitionsApi$ReventlessCore.encodePluginStructureEntry(param[0], param[1]));
       registerAdminItemsAndIndexResolvers(queryResolvers, true);
       adminGraphQL.registerQueries(baseParts.queries, queryResolvers);
@@ -3716,7 +3419,6 @@ function Make($star) {
     AutomationSlice: AutomationSlice,
     OutboundTranslationSlice: OutboundTranslationSlice,
     InboundTranslationSlice: InboundTranslationSlice,
-    Api: Api,
     mcpSupported: true,
     Plugin: Plugin,
     makePlatform: makePlatform,
@@ -3733,7 +3435,6 @@ export {
   platformMCPRef,
   decodePluginEventEnvelope,
   decodeUiFragmentRegistryEventEnvelope,
-  decodeApiFragmentRegistryEventEnvelope,
   MakeWithConfig,
   Make,
 }