@xyo-network/os-runtime 5.0.5 → 5.0.7

package/dist/node/scripts/xyos/index.mjs

@@ -48,188 +48,258 @@ import { boot } from "@xyo-network/bios";
 import { Kernel } from "@xyo-network/kernel";
 import { ModuleFactoryLocator as ModuleFactoryLocator5 } from "@xyo-network/module-factory-locator";
 
-// src/wallet/DappSeedPhraseRepository.ts
-import { HDWallet } from "@xyo-network/account";
-import { PayloadDivinerQuerySchema } from "@xyo-network/diviner-payload-model";
-import { DappWalletSeedPhraseSchema } from "@xyo-network/os-model";
-import { v4 as uuid } from "uuid";
-
-// src/OsCallerBase.ts
+// src/event/bus/Connection.ts
 import { assertEx } from "@xylabs/assert";
-import { asArchivistInstance } from "@xyo-network/archivist-model";
-import { asDivinerInstance } from "@xyo-network/diviner-model";
-var DappsArchivistModuleName = "DappsArchivist";
-var DappsArchivistDevelopmentModuleName = `${DappsArchivistModuleName}Development`;
-var DappsArchivistPayloadDivinerModuleName = "DappsArchivistPayloadDiviner";
-var DappsArchivistPayloadDevelopmentDivinerModuleName = `${DappsArchivistPayloadDivinerModuleName}Development`;
-var RegisteredDappInterfacesArchivistModuleName = "RegisteredDappInterfacesArchivist";
-var OsCallerBase = class {
+import { BaseEmitter } from "@xyo-network/module-event-emitter";
+var EventBusConnection = class extends BaseEmitter {
   static {
-    __name(this, "OsCallerBase");
-  }
-  context;
-  constructor(context) {
-    this.context = context;
-  }
-  // Get the dapps archivist
-  async getDappsArchivist() {
-    const mod = assertEx(await this.context.root.resolve(DappsArchivistModuleName), () => `${DappsArchivistModuleName} not found`);
-    return asArchivistInstance(mod, () => `${DappsArchivistModuleName} is not an archivist`);
-  }
-  // Get the dapps archivist development
-  async getDappsArchivistDevelopment() {
-    const mod = assertEx(await this.context.root.resolve(DappsArchivistDevelopmentModuleName), () => `${DappsArchivistDevelopmentModuleName} not found`);
-    return asArchivistInstance(mod, () => `${DappsArchivistDevelopmentModuleName} is not an archivist`);
+    __name(this, "EventBusConnection");
   }
-  // Get the dapps archivist payload diviner
-  async getDappsArchivistPayloadDiviner() {
-    const mod = assertEx(await this.context.root.resolve(DappsArchivistPayloadDivinerModuleName), () => `${DappsArchivistPayloadDivinerModuleName} not found`);
-    return asDivinerInstance(mod, () => `${DappsArchivistPayloadDivinerModuleName} is not a diviner`);
+  _id;
+  description;
+  type;
+  constructor(request) {
+    super({});
+    this.description = request.description;
+    this.type = request.type;
   }
-  // Get the dapps archivist payload diviner development
-  async getDappsArchivistPayloadDivinerDevelopment() {
-    const mod = assertEx(await this.context.root.resolve(DappsArchivistPayloadDevelopmentDivinerModuleName), () => `${DappsArchivistPayloadDevelopmentDivinerModuleName} not found`);
-    return asDivinerInstance(mod, () => `${DappsArchivistPayloadDevelopmentDivinerModuleName} is not a diviner`);
+  get id() {
+    return assertEx(this._id, () => "Connection ID not set.  Did you forget to call buildConnection()?");
   }
-  // Get the registered dapp interfaces archivist
-  async getRegisteredDappInterfacesArchivist() {
-    const mod = assertEx(await this.context.root.resolve(RegisteredDappInterfacesArchivistModuleName), () => `${RegisteredDappInterfacesArchivistModuleName} not found`);
-    return asArchivistInstance(mod, () => `${RegisteredDappInterfacesArchivistModuleName} is not an archivist`);
+  buildConnection(id) {
+    this._id = id;
   }
 };
 
-// src/wallet/DappSeedPhraseRepository.ts
-var DappSeedPhraseRepository = class extends OsCallerBase {
+// src/event/bus/EventBus.ts
+import { findAs } from "@xylabs/array";
+import { assertEx as assertEx2 } from "@xylabs/assert";
+import { forget } from "@xylabs/forget";
+import { asArchivistInstance, MemoryArchivist, MemoryArchivistConfigSchema } from "@xyo-network/archivist";
+import { asOptionalEventBusEvent, isPubSubConnections } from "@xyo-network/os-model";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
+import { Mutex } from "async-mutex";
+import { v4 as uuid } from "uuid";
+var EventBus = class {
   static {
-    __name(this, "DappSeedPhraseRepository");
-  }
-  allowedNames;
-  // record of all dapps that have requested a seed phrase with the OS
-  dappIdRepository;
-  // record of all walletIds that have been issued to registered dapps
-  walletIdRepository;
-  constructor(xyOs, allowedNames) {
-    super(xyOs), this.allowedNames = allowedNames, this.dappIdRepository = /* @__PURE__ */ new Map(), this.walletIdRepository = /* @__PURE__ */ new Map();
+    __name(this, "EventBus");
   }
-  async add(dappId) {
-    const archivist = await this.getDappsArchivist();
-    const seedPhrase = this.newPhrase();
-    const walletId = uuid();
-    const payload = {
-      dappId,
-      schema: DappWalletSeedPhraseSchema,
-      seedPhrase,
-      walletId
-    };
-    await archivist.insert([
-      payload
-    ]);
-    this.dappIdRepository.set(dappId, payload);
-    this.walletIdRepository.set(walletId, payload);
-    return walletId;
+  // Internal Archivist to store event data
+  _archivist;
+  // Store all connections
+  connections = {};
+  // Store all publisher callbacks for later removal
+  publisherCallbacks = {};
+  startMutex = new Mutex();
+  get archivist() {
+    return asArchivistInstance(assertEx2(this._archivist, () => "Archivist not found.  Did you forget to call start()?"), "not a valid archivist instance");
   }
-  async findOrCreate(dappName) {
-    if (this.allowedNames.includes(dappName)) {
-      const existingPayload = await this.checkDappId(dappName);
-      if (existingPayload) return existingPayload.walletId;
-      try {
-        await this.add(dappName);
-        const existingPayload2 = await this.checkDappId(dappName);
-        if (existingPayload2) return existingPayload2.walletId;
-        throw new Error(`failed to add seed phrase: ${dappName}`);
-      } catch (e) {
-        console.error(e);
-        throw new Error(`failed to add seed phrase: ${dappName}`);
-      }
+  addConnection(connection) {
+    const id = uuid();
+    this.connections[id] = connection;
+    connection.buildConnection(id);
+    if (isPubSubConnections(connection)) {
+      this.handlePublisherAdd(connection);
     } else {
-      throw new Error(`${dappName} is not allowed to register a seed phase. NOTE: this is a safeguard till 3rd party dApps can be validated`);
+      throw new Error("Unsupported connection type. Must be PubSub");
     }
+    return connection;
   }
-  async request(walletId) {
-    return (await this.checkWalletId(walletId))?.seedPhrase;
+  removeConnection(connectionId) {
+    const connection = this.connections[connectionId];
+    if (!connection) {
+      throw new Error("Connection not found " + connectionId);
+    }
+    if (connection && isPubSubConnections(connection)) {
+      this.handlePublisherRemove(connection);
+    }
+    delete this.connections[connectionId];
   }
-  async checkDappId(dappId) {
-    const diviner = await this.getDappsArchivistPayloadDiviner();
-    const query = {
-      dappId,
-      limit: 1,
-      order: "desc",
-      schema: PayloadDivinerQuerySchema,
-      schemas: [
-        DappWalletSeedPhraseSchema
-      ]
-    };
-    const results = await diviner.divine([
-      query
-    ]);
-    return results.length > 0 ? results[0] : void 0;
+  async start(storeName = "EventBusArchivist") {
+    return await this.startMutex.runExclusive(async () => {
+      if (this._archivist) {
+        console.warn("EventBus already started");
+        return this;
+      }
+      this._archivist = await MemoryArchivist.create({
+        config: {
+          name: storeName,
+          schema: MemoryArchivistConfigSchema
+        }
+      });
+      this.archivist.on("inserted", ({ payloads }) => {
+        const eventBusEvent = findAs(payloads, asOptionalEventBusEvent);
+        if (!eventBusEvent) return;
+        for (const connectionId in this.connections) {
+          const connection = this.connections[connectionId];
+          if (isPubSubConnections(connection) && connection.subscribableEvents) {
+            for (const [eventName, callback] of connection.subscribableEvents.entries()) {
+              if (eventName !== eventBusEvent.name) continue;
+              if (callback) {
+                const forgettable = /* @__PURE__ */ __name(async () => await callback({
+                  payloads
+                }), "forgettable");
+                forget(forgettable());
+              }
+            }
+          }
+        }
+      });
+      return this;
+    });
   }
-  async checkWalletId(walletId) {
-    const diviner = await this.getDappsArchivistPayloadDiviner();
-    const query = {
-      limit: 1,
-      order: "desc",
-      schema: PayloadDivinerQuerySchema,
-      schemas: [
-        DappWalletSeedPhraseSchema
-      ],
-      walletId
-    };
-    const results = await diviner.divine([
-      query
-    ]);
-    return results.length > 0 ? results[0] : void 0;
+  handlePublisherAdd(connection) {
+    for (const eventName of connection.publishableEvents ?? []) {
+      const connectionPublisherCallback = /* @__PURE__ */ __name(async ({ payloads }) => {
+        const event = {
+          name: eventName,
+          schema: "network.xyo.event.bus.event"
+        };
+        const eventPayloads = payloads ?? [];
+        event.sources = await PayloadBuilder.dataHashes(eventPayloads);
+        try {
+          await this.archivist.insert([
+            event,
+            ...payloads ?? []
+          ]);
+        } catch (e) {
+          console.error("Error inserting event into archivist", e);
+        }
+      }, "connectionPublisherCallback");
+      connection.on(eventName, connectionPublisherCallback);
+      const callbackId = connection.id + eventName;
+      this.publisherCallbacks[callbackId] = connectionPublisherCallback;
+    }
   }
-  newPhrase() {
-    return HDWallet.generateMnemonic();
+  handlePublisherRemove(connection) {
+    for (const [, event] of connection.publishableEvents?.entries() ?? []) {
+      const id = connection.id + event;
+      const callback = this.publisherCallbacks[id];
+      if (callback) connection.off(event, callback);
+    }
   }
 };
 
-// src/DappCallerBase.ts
-import { assertEx as assertEx2 } from "@xylabs/assert";
-import { toJsonString } from "@xylabs/object";
-import { asArchivistInstance as asArchivistInstance2 } from "@xyo-network/archivist-model";
-import { asDivinerInstance as asDivinerInstance2 } from "@xyo-network/diviner-model";
-var DappArchivistModuleName = "DappArchivist";
-var IntentArchivistModuleName = "IntentArchivist";
-var IntentArchivistPayloadDivinerModuleName = "IntentArchivistPayloadDiviner";
-var DappArchivistPayloadDivinerModuleName = "DappArchivistPayloadDiviner";
-var DappCallerBase = class {
+// src/event/bus/PubSubConnection.ts
+var EventBusPubSubConnection = class extends EventBusConnection {
   static {
-    __name(this, "DappCallerBase");
-  }
-  context;
-  constructor(context) {
-    this.context = context;
-  }
-  /**
-  * Get the DappArchivist
-  */
-  async getDappArchivist() {
-    const mod = assertEx2(await this.context.root.resolve(DappArchivistModuleName), () => `${DappArchivistModuleName} not found [${toJsonString(this.context.root.publicChildren())}]`);
-    return asArchivistInstance2(mod, () => `${DappArchivistModuleName} is not an archivist`);
+    __name(this, "EventBusPubSubConnection");
   }
-  /**
-  * Get the DappArchivistPayloadDiviner
-  */
-  async getDappArchivistPayloadDiviner() {
-    const mod = assertEx2(await this.context.root.resolve(DappArchivistPayloadDivinerModuleName), () => `${DappArchivistPayloadDivinerModuleName} not found`);
-    return asDivinerInstance2(mod, () => `${DappArchivistPayloadDivinerModuleName} is not a diviner`);
+  publishableEvents;
+  subscribableEvents;
+  constructor(request) {
+    super(request);
+    if (request.type !== "PubSub") {
+      throw new Error("Invalid connection type. Must be PubSub");
+    }
+    this.publishableEvents = request.publishableEvents;
+    this.subscribableEvents = request.subscribableEvents;
   }
-  /**
-  * Get the IntentArchivist
-  */
-  async getDappIntentArchivist() {
-    const mod = assertEx2(await this.context.root.resolve(IntentArchivistModuleName), () => `${IntentArchivistModuleName} not found`);
-    return asArchivistInstance2(mod, () => `${IntentArchivistModuleName} is not an archivist`);
+};
+
+// src/event/connections/DappAccessRequest.ts
+var DappAccessRequestEvent = "dappAccessRequest";
+var dappAccessRequestConnectionRequest = {
+  publishableEvents: [
+    DappAccessRequestEvent
+  ],
+  type: "PubSub"
+};
+var dappAccessRequestConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(dappAccessRequestConnectionRequest), "dappAccessRequestConnection");
+
+// src/event/connections/ExposeDappRequest.ts
+var ExposeDappRequestEvent = "exposeDappRequest";
+var exposeDappConnectionRequest = {
+  publishableEvents: [
+    ExposeDappRequestEvent
+  ],
+  type: "PubSub"
+};
+var exposeDappRequestConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(exposeDappConnectionRequest), "exposeDappRequestConnection");
+
+// src/event/connections/OsPubSubNetworkReady.ts
+var OsPubSubNetworkReadyEvent = "osPubSubNetworkReady";
+var osPubSubNetworkConnectionRequest = {
+  publishableEvents: [
+    OsPubSubNetworkReadyEvent
+  ],
+  type: "PubSub"
+};
+var osPubSubNetworkReadyConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(osPubSubNetworkConnectionRequest), "osPubSubNetworkReadyConnection");
+
+// src/event/connections/OsSettingsReady.ts
+var OsSettingsReadyEvent = "osSettingsReady";
+var osSettingsConnectionRequest = {
+  publishableEvents: [
+    OsSettingsReadyEvent
+  ],
+  type: "PubSub"
+};
+var osSettingsReadyConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(osSettingsConnectionRequest), "osSettingsReadyConnection");
+
+// src/event/connections/OsXyoPublicReady.ts
+var OsXyoPublicNetworkReadyEvent = "osXyoPublicNetworkReady";
+var osXyoPublicNetworkConnectionRequest = {
+  publishableEvents: [
+    OsXyoPublicNetworkReadyEvent
+  ],
+  type: "PubSub"
+};
+var osXyoPublicNetworkReadyConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(osXyoPublicNetworkConnectionRequest), "osXyoPublicNetworkReadyConnection");
+
+// src/lib/initializeXns.ts
+import { asDivinerInstance } from "@xyo-network/diviner-model";
+import { ResolveHelper } from "@xyo-network/module-model";
+import { NameRegistrarTransformer } from "@xyo-network/module-resolver";
+var initializeXns = /* @__PURE__ */ __name(async (xnsNode) => {
+  if (ResolveHelper.transformers.length === 0) {
+    const registrarDiviner = asDivinerInstance(await xnsNode?.resolve("AddressRecords:AddressRecordIndexDiviner"));
+    if (registrarDiviner) {
+      const transformer = new NameRegistrarTransformer(registrarDiviner, "xyo");
+      ResolveHelper.transformers = [
+        transformer
+      ];
+      return true;
+    }
   }
-  // Get the IntentArchivistPayloadDiviner
-  async getDappIntentArchivistPayloadDiviner() {
-    const mod = assertEx2(await this.context.root.resolve(IntentArchivistPayloadDivinerModuleName), () => `${IntentArchivistPayloadDivinerModuleName} not found`);
-    return asDivinerInstance2(mod, () => `${IntentArchivistPayloadDivinerModuleName} is not a diviner`);
+  return false;
+}, "initializeXns");
+
+// src/lib/NameTransforms.ts
+var NameTransforms = class _NameTransforms {
+  static {
+    __name(this, "NameTransforms");
+  }
+  value;
+  constructor(value) {
+    this.value = value;
+  }
+  static deSlug(value) {
+    return value.replaceAll("-", " ").split(" ").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+  }
+  static moduleName(value) {
+    return value.replaceAll(" ", "");
+  }
+  static slug(value) {
+    return value.replaceAll(" ", "-").toLocaleLowerCase();
+  }
+  deSlug() {
+    return _NameTransforms.deSlug(this.value);
+  }
+  moduleName() {
+    return _NameTransforms.moduleName(this.value);
+  }
+  slug() {
+    return _NameTransforms.slug(this.value);
   }
 };
 
+// src/loadOsNode.ts
+import { IndexedDbArchivist } from "@xyo-network/archivist-indexeddb";
+import { IndexedDbPayloadDiviner } from "@xyo-network/diviner-payload-indexeddb";
+import { ManifestWrapper } from "@xyo-network/manifest-wrapper";
+import { ModuleFactoryLocator } from "@xyo-network/module-factory-locator";
+
 // src/manifest/os-node.manifest.json
 var os_node_manifest_default = {
   $schema: "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/main/packages/manifest/src/compilations/dapp-package-manifest-schema.json",
@@ -364,56 +434,91 @@ var os_node_manifest_default = {
   schema: "network.xyo.manifest.package.dapp"
 };
 
-// src/lib/initializeXns.ts
-import { asDivinerInstance as asDivinerInstance3 } from "@xyo-network/diviner-model";
-import { ResolveHelper } from "@xyo-network/module-model";
-import { NameRegistrarTransformer } from "@xyo-network/module-resolver";
-var initializeXns = /* @__PURE__ */ __name(async (xnsNode) => {
-  if (ResolveHelper.transformers.length === 0) {
-    const registrarDiviner = asDivinerInstance3(await xnsNode?.resolve("AddressRecords:AddressRecordIndexDiviner"));
-    if (registrarDiviner) {
-      const transformer = new NameRegistrarTransformer(registrarDiviner, "xyo");
-      ResolveHelper.transformers = [
-        transformer
-      ];
-      return true;
-    }
+// src/loadOsNode.ts
+var OS_NODE_PATH = "1'";
+var getDefaultOsNodeLocator = /* @__PURE__ */ __name(() => {
+  const locator = new ModuleFactoryLocator();
+  locator.register(IndexedDbArchivist, {
+    "network.xyo.archivist.persistence.scope": "device"
+  });
+  locator.register(IndexedDbPayloadDiviner, {
+    "network.xyo.archivist.persistence.scope": "device"
+  });
+  return locator;
+}, "getDefaultOsNodeLocator");
+var loadOsNode = /* @__PURE__ */ __name(async (osWallet, locator) => {
+  try {
+    const osNodeWallet = await osWallet.derivePath(OS_NODE_PATH);
+    const osNodeLocator = locator ?? getDefaultOsNodeLocator();
+    const manifestWrapper = new ManifestWrapper(os_node_manifest_default, osNodeWallet, osNodeLocator);
+    const osNode = (await manifestWrapper.loadNodes())[0];
+    return [
+      osNode
+    ];
+  } catch (e) {
+    const error = e;
+    console.error(`Error creating os node: ${error.message}`);
+    console.error(`Error creating os node: ${error.stack}`);
+    throw new Error(`Error creating os node: ${error.message}`);
   }
-  return false;
-}, "initializeXns");
+}, "loadOsNode");
 
-// src/lib/NameTransforms.ts
-var NameTransforms = class _NameTransforms {
+// src/registration/DappRegistrationService.ts
+import { forget as forget2 } from "@xylabs/forget";
+import { fulfilled, rejected } from "@xylabs/promise";
+import { ModuleFactoryLocator as ModuleFactoryLocator4 } from "@xyo-network/module-factory-locator";
+import { DappIntentTypes, DappMode as DappMode2, isRegisteredDappAccessDappSet, isRegisteredDappExposedDappSet } from "@xyo-network/os-model";
+
+// src/intent/Caller.ts
+import { PayloadDivinerQuerySchema } from "@xyo-network/diviner-payload-model";
+import { DappIntentSchema, DappMode } from "@xyo-network/os-model";
+
+// src/DappCallerBase.ts
+import { assertEx as assertEx3 } from "@xylabs/assert";
+import { toJsonString } from "@xylabs/object";
+import { asArchivistInstance as asArchivistInstance2 } from "@xyo-network/archivist-model";
+import { asDivinerInstance as asDivinerInstance2 } from "@xyo-network/diviner-model";
+var DappArchivistModuleName = "DappArchivist";
+var IntentArchivistModuleName = "IntentArchivist";
+var IntentArchivistPayloadDivinerModuleName = "IntentArchivistPayloadDiviner";
+var DappArchivistPayloadDivinerModuleName = "DappArchivistPayloadDiviner";
+var DappCallerBase = class {
   static {
-    __name(this, "NameTransforms");
-  }
-  value;
-  constructor(value) {
-    this.value = value;
-  }
-  static deSlug(value) {
-    return value.replaceAll("-", " ").split(" ").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+    __name(this, "DappCallerBase");
   }
-  static moduleName(value) {
-    return value.replaceAll(" ", "");
+  context;
+  constructor(context) {
+    this.context = context;
   }
-  static slug(value) {
-    return value.replaceAll(" ", "-").toLocaleLowerCase();
+  /**
+  * Get the DappArchivist
+  */
+  async getDappArchivist() {
+    const mod = assertEx3(await this.context.root.resolve(DappArchivistModuleName), () => `${DappArchivistModuleName} not found [${toJsonString(this.context.root.publicChildren())}]`);
+    return asArchivistInstance2(mod, () => `${DappArchivistModuleName} is not an archivist`);
   }
-  deSlug() {
-    return _NameTransforms.deSlug(this.value);
+  /**
+  * Get the DappArchivistPayloadDiviner
+  */
+  async getDappArchivistPayloadDiviner() {
+    const mod = assertEx3(await this.context.root.resolve(DappArchivistPayloadDivinerModuleName), () => `${DappArchivistPayloadDivinerModuleName} not found`);
+    return asDivinerInstance2(mod, () => `${DappArchivistPayloadDivinerModuleName} is not a diviner`);
   }
-  moduleName() {
-    return _NameTransforms.moduleName(this.value);
+  /**
+  * Get the IntentArchivist
+  */
+  async getDappIntentArchivist() {
+    const mod = assertEx3(await this.context.root.resolve(IntentArchivistModuleName), () => `${IntentArchivistModuleName} not found`);
+    return asArchivistInstance2(mod, () => `${IntentArchivistModuleName} is not an archivist`);
   }
-  slug() {
-    return _NameTransforms.slug(this.value);
+  // Get the IntentArchivistPayloadDiviner
+  async getDappIntentArchivistPayloadDiviner() {
+    const mod = assertEx3(await this.context.root.resolve(IntentArchivistPayloadDivinerModuleName), () => `${IntentArchivistPayloadDivinerModuleName} not found`);
+    return asDivinerInstance2(mod, () => `${IntentArchivistPayloadDivinerModuleName} is not a diviner`);
   }
 };
 
 // src/intent/Caller.ts
-import { PayloadDivinerQuerySchema as PayloadDivinerQuerySchema2 } from "@xyo-network/diviner-payload-model";
-import { DappIntentSchema, DappMode } from "@xyo-network/os-model";
 var DappIntentCaller = class _DappIntentCaller extends DappCallerBase {
   static {
     __name(this, "DappIntentCaller");
@@ -466,7 +571,7 @@ var DappIntentCaller = class _DappIntentCaller extends DappCallerBase {
     const query = {
       limit: 1,
       order: "desc",
-      schema: PayloadDivinerQuerySchema2,
+      schema: PayloadDivinerQuerySchema,
       sourceDappId: dappName
     };
     return await diviner.divine([
@@ -475,215 +580,326 @@ var DappIntentCaller = class _DappIntentCaller extends DappCallerBase {
   }
 };
 
-// src/classes/registration/DappRegistrationService.ts
-import { forget as forget2 } from "@xylabs/forget";
-import { fulfilled, rejected } from "@xylabs/promise";
-import { ModuleFactoryLocator as ModuleFactoryLocator3 } from "@xyo-network/module-factory-locator";
-import { DappIntentTypes, DappMode as DappMode2, isRegisteredDappAccessDappSet, isRegisteredDappExposedDappSet } from "@xyo-network/os-model";
+// src/system/ManageSystemDapps.ts
+import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
+import semver from "semver";
 
-// src/event/bus/Connection.ts
-import { assertEx as assertEx3 } from "@xylabs/assert";
-import { BaseEmitter } from "@xyo-network/module-event-emitter";
-var EventBusConnection = class extends BaseEmitter {
+// src/OsCallerBase.ts
+import { assertEx as assertEx4 } from "@xylabs/assert";
+import { asArchivistInstance as asArchivistInstance3 } from "@xyo-network/archivist-model";
+import { asDivinerInstance as asDivinerInstance3 } from "@xyo-network/diviner-model";
+var DappsArchivistModuleName = "DappsArchivist";
+var DappsArchivistDevelopmentModuleName = `${DappsArchivistModuleName}Development`;
+var DappsArchivistPayloadDivinerModuleName = "DappsArchivistPayloadDiviner";
+var DappsArchivistPayloadDevelopmentDivinerModuleName = `${DappsArchivistPayloadDivinerModuleName}Development`;
+var RegisteredDappInterfacesArchivistModuleName = "RegisteredDappInterfacesArchivist";
+var OsCallerBase = class {
   static {
-    __name(this, "EventBusConnection");
+    __name(this, "OsCallerBase");
   }
-  _id;
-  description;
-  type;
-  constructor(request) {
-    super({});
-    this.description = request.description;
-    this.type = request.type;
+  context;
+  constructor(context) {
+    this.context = context;
   }
-  get id() {
-    return assertEx3(this._id, () => "Connection ID not set.  Did you forget to call buildConnection()?");
+  // Get the dapps archivist
+  async getDappsArchivist() {
+    const mod = assertEx4(await this.context.root.resolve(DappsArchivistModuleName), () => `${DappsArchivistModuleName} not found`);
+    return asArchivistInstance3(mod, () => `${DappsArchivistModuleName} is not an archivist`);
   }
-  buildConnection(id) {
-    this._id = id;
+  // Get the dapps archivist development
+  async getDappsArchivistDevelopment() {
+    const mod = assertEx4(await this.context.root.resolve(DappsArchivistDevelopmentModuleName), () => `${DappsArchivistDevelopmentModuleName} not found`);
+    return asArchivistInstance3(mod, () => `${DappsArchivistDevelopmentModuleName} is not an archivist`);
+  }
+  // Get the dapps archivist payload diviner
+  async getDappsArchivistPayloadDiviner() {
+    const mod = assertEx4(await this.context.root.resolve(DappsArchivistPayloadDivinerModuleName), () => `${DappsArchivistPayloadDivinerModuleName} not found`);
+    return asDivinerInstance3(mod, () => `${DappsArchivistPayloadDivinerModuleName} is not a diviner`);
+  }
+  // Get the dapps archivist payload diviner development
+  async getDappsArchivistPayloadDivinerDevelopment() {
+    const mod = assertEx4(await this.context.root.resolve(DappsArchivistPayloadDevelopmentDivinerModuleName), () => `${DappsArchivistPayloadDevelopmentDivinerModuleName} not found`);
+    return asDivinerInstance3(mod, () => `${DappsArchivistPayloadDevelopmentDivinerModuleName} is not a diviner`);
+  }
+  // Get the registered dapp interfaces archivist
+  async getRegisteredDappInterfacesArchivist() {
+    const mod = assertEx4(await this.context.root.resolve(RegisteredDappInterfacesArchivistModuleName), () => `${RegisteredDappInterfacesArchivistModuleName} not found`);
+    return asArchivistInstance3(mod, () => `${RegisteredDappInterfacesArchivistModuleName} is not an archivist`);
   }
 };
 
-// src/event/bus/EventBus.ts
-import { findAs } from "@xylabs/array";
-import { assertEx as assertEx4 } from "@xylabs/assert";
-import { forget } from "@xylabs/forget";
-import { asArchivistInstance as asArchivistInstance3, MemoryArchivist, MemoryArchivistConfigSchema } from "@xyo-network/archivist";
-import { asOptionalEventBusEvent, isPubSubConnections } from "@xyo-network/os-model";
-import { PayloadBuilder } from "@xyo-network/payload-builder";
-import { Mutex } from "async-mutex";
-import { v4 as uuid2 } from "uuid";
-var EventBus = class {
+// src/system/Queries.ts
+import { PayloadDivinerQuerySchema as PayloadDivinerQuerySchema2 } from "@xyo-network/diviner-payload-model";
+import { DappConfigSchema, DappIconSchema, DappWidgetConfigSchema, UnregisteredDappAccessSchema } from "@xyo-network/os-model";
+import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
+var SystemDappQueries = {
+  async getDappAccess(diviner, name, version) {
+    const accessQuery = {
+      order: "desc",
+      registeringDappId: name,
+      schema: PayloadDivinerQuerySchema2,
+      schemas: [
+        UnregisteredDappAccessSchema
+      ],
+      version
+    };
+    return await diviner.divine([
+      accessQuery
+    ]);
+  },
+  async getLatestConfig(diviner, name) {
+    const configQuery = {
+      limit: 1,
+      name,
+      order: "desc",
+      schema: PayloadDivinerQuerySchema2,
+      schemas: [
+        DappConfigSchema
+      ]
+    };
+    const [dappConfig] = await diviner.divine([
+      configQuery
+    ]);
+    return dappConfig;
+  },
+  async getLatestIcon(diviner, name, version) {
+    const iconQuery = {
+      name,
+      order: "desc",
+      schema: PayloadDivinerQuerySchema2,
+      schemas: [
+        DappIconSchema
+      ],
+      version
+    };
+    const [dappIcon] = await diviner.divine([
+      iconQuery
+    ]);
+    return dappIcon;
+  },
+  async getWidgetConfigs(diviner, name, version) {
+    const widgetConfigQuery = {
+      dappId: name,
+      order: "desc",
+      schema: PayloadDivinerQuerySchema2,
+      schemas: [
+        DappWidgetConfigSchema
+      ],
+      version
+    };
+    const widgetConfigs = await diviner.divine([
+      widgetConfigQuery
+    ]);
+    const uniqueConfigs = {};
+    for (const widgetConfig of widgetConfigs) {
+      const hash = await PayloadBuilder2.dataHash(widgetConfig);
+      uniqueConfigs[widgetConfig.mode ?? hash] = widgetConfig;
+    }
+    return Object.values(uniqueConfigs);
+  }
+};
+
+// src/system/ManageSystemDapps.ts
+var ManageSystemDapps = class extends OsCallerBase {
   static {
-    __name(this, "EventBus");
+    __name(this, "ManageSystemDapps");
   }
-  // Internal Archivist to store event data
-  _archivist;
-  // Store all connections
-  connections = {};
-  // Store all publisher callbacks for later removal
-  publisherCallbacks = {};
-  startMutex = new Mutex();
-  get archivist() {
-    return asArchivistInstance3(assertEx4(this._archivist, () => "Archivist not found.  Did you forget to call start()?"), "not a valid archivist instance");
+  defaultSystemNames;
+  defaultSystemDapps;
+  defaultSystemDappParams;
+  locator;
+  developmentMode;
+  onErrorCallbacks;
+  constructor(context, defaultSystemNames, defaultSystemDapps, defaultSystemDappParams, locator, developmentMode) {
+    super(context), this.defaultSystemNames = defaultSystemNames, this.defaultSystemDapps = defaultSystemDapps, this.defaultSystemDappParams = defaultSystemDappParams, this.locator = locator, this.developmentMode = developmentMode, this.onErrorCallbacks = [];
   }
-  addConnection(connection) {
-    const id = uuid2();
-    this.connections[id] = connection;
-    connection.buildConnection(id);
-    if (isPubSubConnections(connection)) {
-      this.handlePublisherAdd(connection);
-    } else {
-      throw new Error("Unsupported connection type. Must be PubSub");
-    }
-    return connection;
+  /**
+  * Add a callback to listen for errors throwing during system dapp registration
+  * @param  {ErrorListener} errorListener
+  */
+  addErrorListener(errorListener) {
+    this.onErrorCallbacks.push(errorListener);
   }
-  removeConnection(connectionId) {
-    const connection = this.connections[connectionId];
-    if (!connection) {
-      throw new Error("Connection not found " + connectionId);
-    }
-    if (connection && isPubSubConnections(connection)) {
-      this.handlePublisherRemove(connection);
-    }
-    delete this.connections[connectionId];
+  /**
+  * Installs the dapps into the OS and builds the appropriate DappSet
+  */
+  async install() {
+    await this.insertPayloads();
+    return await this.latestSets();
   }
-  async start(storeName = "EventBusArchivist") {
-    return await this.startMutex.runExclusive(async () => {
-      if (this._archivist) {
-        console.warn("EventBus already started");
-        return this;
-      }
-      this._archivist = await MemoryArchivist.create({
-        config: {
-          name: storeName,
-          schema: MemoryArchivistConfigSchema
-        }
-      });
-      this.archivist.on("inserted", ({ payloads }) => {
-        const eventBusEvent = findAs(payloads, asOptionalEventBusEvent);
-        if (!eventBusEvent) return;
-        for (const connectionId in this.connections) {
-          const connection = this.connections[connectionId];
-          if (isPubSubConnections(connection) && connection.subscribableEvents) {
-            for (const [eventName, callback] of connection.subscribableEvents.entries()) {
-              if (eventName !== eventBusEvent.name) continue;
-              if (callback) {
-                const forgettable = /* @__PURE__ */ __name(async () => await callback({
-                  payloads
-                }), "forgettable");
-                forget(forgettable());
-              }
-            }
-          }
-        }
-      });
-      return this;
-    });
+  async freshInstall(archivist) {
+    await archivist.insert(this.defaultSystemDapps);
   }
-  handlePublisherAdd(connection) {
-    for (const eventName of connection.publishableEvents ?? []) {
-      const connectionPublisherCallback = /* @__PURE__ */ __name(async ({ payloads }) => {
-        const event = {
-          name: eventName,
-          schema: "network.xyo.event.bus.event"
-        };
-        const eventPayloads = payloads ?? [];
-        event.sources = await PayloadBuilder.dataHashes(eventPayloads);
+  async insertPayloads() {
+    const archivist = this.developmentMode ? await this.getDappsArchivistDevelopment() : await this.getDappsArchivist();
+    try {
+      const allPayloads = await archivist.all();
+      if (allPayloads.length === 0) {
+        await this.freshInstall(archivist);
+        return true;
+      }
+      for (const systemDappPayload of this.defaultSystemDapps) {
         try {
-          await this.archivist.insert([
-            event,
-            ...payloads ?? []
-          ]);
+          const validSemver = semver.valid(systemDappPayload.version);
+          if (!validSemver) throw new Error("semver is a valid type (string) but was not able to be parsed");
         } catch (e) {
-          console.error("Error inserting event into archivist", e);
+          console.error(`${systemDappPayload.version} does not appear to be a valid semver value`, e);
+          continue;
         }
-      }, "connectionPublisherCallback");
-      connection.on(eventName, connectionPublisherCallback);
-      const callbackId = connection.id + eventName;
-      this.publisherCallbacks[callbackId] = connectionPublisherCallback;
+        const [existing] = await archivist.get([
+          await PayloadBuilder3.dataHash(systemDappPayload)
+        ]);
+        if (existing) continue;
+        await archivist.insert([
+          systemDappPayload
+        ]);
+      }
+      return true;
+    } catch (e) {
+      console.error("error installing system dapps");
+      throw e;
     }
   }
-  handlePublisherRemove(connection) {
-    for (const [, event] of connection.publishableEvents?.entries() ?? []) {
-      const id = connection.id + event;
-      const callback = this.publisherCallbacks[id];
-      if (callback) connection.off(event, callback);
+  async latestSets() {
+    const diviner = this.developmentMode ? await this.getDappsArchivistPayloadDivinerDevelopment() : await this.getDappsArchivistPayloadDiviner();
+    const dappSets = [];
+    const failedPayloads = [];
+    for (const name of this.defaultSystemNames) {
+      try {
+        const dappConfig = await SystemDappQueries.getLatestConfig(diviner, name);
+        if (!dappConfig) {
+          console.error(`No config found for dapp ${name}`);
+          continue;
+        }
+        const dappIcon = await SystemDappQueries.getLatestIcon(diviner, name, dappConfig.version);
+        if (!dappIcon) {
+          console.error(`No icon found for dapp ${dappConfig.name}`);
+          failedPayloads.push(dappConfig);
+          continue;
+        }
+        const dappAccess = await SystemDappQueries.getDappAccess(diviner, name, dappConfig.version);
+        const dappParams = this.defaultSystemDappParams[dappConfig.name];
+        if (!dappParams) {
+          console.error(`No params found for dapp ${dappConfig.name}.  Did you forget to add it to OsDappParams?`);
+          failedPayloads.push(dappConfig);
+          continue;
+        }
+        const dappWidgetConfigs = await SystemDappQueries.getWidgetConfigs(diviner, name, dappConfig.version);
+        dappSets.push({
+          dapp: {
+            accessors: dappAccess,
+            config: dappConfig,
+            icon: dappIcon,
+            params: dappParams,
+            widgetConfigs: dappWidgetConfigs
+          }
+        });
+      } catch {
+        console.error(`Failed to build dapp ${name}`);
+      }
+    }
+    if (failedPayloads.length > 0) {
+      for (const cb of this.onErrorCallbacks) cb(failedPayloads);
     }
+    return dappSets;
   }
 };
 
-// src/event/bus/PubSubConnection.ts
-var EventBusPubSubConnection = class extends EventBusConnection {
+// src/wallet/DappSeedPhraseRepository.ts
+import { HDWallet } from "@xyo-network/account";
+import { PayloadDivinerQuerySchema as PayloadDivinerQuerySchema3 } from "@xyo-network/diviner-payload-model";
+import { DappWalletSeedPhraseSchema } from "@xyo-network/os-model";
+import { v4 as uuid2 } from "uuid";
+var DappSeedPhraseRepository = class extends OsCallerBase {
   static {
-    __name(this, "EventBusPubSubConnection");
+    __name(this, "DappSeedPhraseRepository");
   }
-  publishableEvents;
-  subscribableEvents;
-  constructor(request) {
-    super(request);
-    if (request.type !== "PubSub") {
-      throw new Error("Invalid connection type. Must be PubSub");
-    }
-    this.publishableEvents = request.publishableEvents;
-    this.subscribableEvents = request.subscribableEvents;
+  allowedNames;
+  // record of all dapps that have requested a seed phrase with the OS
+  dappIdRepository;
+  // record of all walletIds that have been issued to registered dapps
+  walletIdRepository;
+  constructor(xyOs, allowedNames) {
+    super(xyOs), this.allowedNames = allowedNames, this.dappIdRepository = /* @__PURE__ */ new Map(), this.walletIdRepository = /* @__PURE__ */ new Map();
+  }
+  async add(dappId) {
+    const archivist = await this.getDappsArchivist();
+    const seedPhrase = this.newPhrase();
+    const walletId = uuid2();
+    const payload = {
+      dappId,
+      schema: DappWalletSeedPhraseSchema,
+      seedPhrase,
+      walletId
+    };
+    await archivist.insert([
+      payload
+    ]);
+    this.dappIdRepository.set(dappId, payload);
+    this.walletIdRepository.set(walletId, payload);
+    return walletId;
+  }
+  async findOrCreate(dappName) {
+    if (this.allowedNames.includes(dappName)) {
+      const existingPayload = await this.checkDappId(dappName);
+      if (existingPayload) return existingPayload.walletId;
+      try {
+        await this.add(dappName);
+        const existingPayload2 = await this.checkDappId(dappName);
+        if (existingPayload2) return existingPayload2.walletId;
+        throw new Error(`failed to add seed phrase: ${dappName}`);
+      } catch (e) {
+        console.error(e);
+        throw new Error(`failed to add seed phrase: ${dappName}`);
+      }
+    } else {
+      throw new Error(`${dappName} is not allowed to register a seed phase. NOTE: this is a safeguard till 3rd party dApps can be validated`);
+    }
+  }
+  async request(walletId) {
+    return (await this.checkWalletId(walletId))?.seedPhrase;
+  }
+  async checkDappId(dappId) {
+    const diviner = await this.getDappsArchivistPayloadDiviner();
+    const query = {
+      dappId,
+      limit: 1,
+      order: "desc",
+      schema: PayloadDivinerQuerySchema3,
+      schemas: [
+        DappWalletSeedPhraseSchema
+      ]
+    };
+    const results = await diviner.divine([
+      query
+    ]);
+    return results.length > 0 ? results[0] : void 0;
+  }
+  async checkWalletId(walletId) {
+    const diviner = await this.getDappsArchivistPayloadDiviner();
+    const query = {
+      limit: 1,
+      order: "desc",
+      schema: PayloadDivinerQuerySchema3,
+      schemas: [
+        DappWalletSeedPhraseSchema
+      ],
+      walletId
+    };
+    const results = await diviner.divine([
+      query
+    ]);
+    return results.length > 0 ? results[0] : void 0;
+  }
+  newPhrase() {
+    return HDWallet.generateMnemonic();
   }
 };
 
-// src/event/connections/DappAccessRequest.ts
-var DappAccessRequestEvent = "dappAccessRequest";
-var dappAccessRequestConnectionRequest = {
-  publishableEvents: [
-    DappAccessRequestEvent
-  ],
-  type: "PubSub"
-};
-var dappAccessRequestConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(dappAccessRequestConnectionRequest), "dappAccessRequestConnection");
-
-// src/event/connections/ExposeDappRequest.ts
-var ExposeDappRequestEvent = "exposeDappRequest";
-var exposeDappConnectionRequest = {
-  publishableEvents: [
-    ExposeDappRequestEvent
-  ],
-  type: "PubSub"
-};
-var exposeDappRequestConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(exposeDappConnectionRequest), "exposeDappRequestConnection");
-
-// src/event/connections/OsPubSubNetworkReady.ts
-var OsPubSubNetworkReadyEvent = "osPubSubNetworkReady";
-var osPubSubNetworkConnectionRequest = {
-  publishableEvents: [
-    OsPubSubNetworkReadyEvent
-  ],
-  type: "PubSub"
-};
-var osPubSubNetworkReadyConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(osPubSubNetworkConnectionRequest), "osPubSubNetworkReadyConnection");
-
-// src/event/connections/OsSettingsReady.ts
-var OsSettingsReadyEvent = "osSettingsReady";
-var osSettingsConnectionRequest = {
-  publishableEvents: [
-    OsSettingsReadyEvent
-  ],
-  type: "PubSub"
-};
-var osSettingsReadyConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(osSettingsConnectionRequest), "osSettingsReadyConnection");
-
-// src/event/connections/OsXyoPublicReady.ts
-var OsXyoPublicNetworkReadyEvent = "osXyoPublicNetworkReady";
-var osXyoPublicNetworkConnectionRequest = {
-  publishableEvents: [
-    OsXyoPublicNetworkReadyEvent
-  ],
-  type: "PubSub"
-};
-var osXyoPublicNetworkReadyConnection = /* @__PURE__ */ __name(() => new EventBusPubSubConnection(osXyoPublicNetworkConnectionRequest), "osXyoPublicNetworkReadyConnection");
-
 // src/XyOsDapp.ts
 import { assertEx as assertEx6 } from "@xylabs/assert";
-import { ManifestWrapper } from "@xyo-network/manifest-wrapper";
-import { ModuleFactoryLocator as ModuleFactoryLocator2 } from "@xyo-network/module-factory-locator";
+import { ManifestWrapper as ManifestWrapper2 } from "@xyo-network/manifest-wrapper";
+import { ModuleFactoryLocator as ModuleFactoryLocator3 } from "@xyo-network/module-factory-locator";
 import { DappPackageManifestPayloadSchema } from "@xyo-network/os-model";
 
 // src/manifests/dapp-window.manifest.json
@@ -727,7 +943,7 @@ var dapp_window_manifest_default = {
 // src/XyOsBase.ts
 import { assertEx as assertEx5 } from "@xylabs/assert";
 import { BaseEmitter as BaseEmitter2 } from "@xyo-network/module-event-emitter";
-import { ModuleFactoryLocator } from "@xyo-network/module-factory-locator";
+import { ModuleFactoryLocator as ModuleFactoryLocator2 } from "@xyo-network/module-factory-locator";
 import { Mutex as Mutex2 } from "async-mutex";
 var XyOsContextBase = class extends BaseEmitter2 {
   static {
@@ -758,7 +974,7 @@ var XyOsContextBase = class extends BaseEmitter2 {
     return assertEx5(this.params.manifest, () => "Missing manifest");
   }
   get platformLocator() {
-    this._platformLocator = this._platformLocator ?? this.params.platformLocator ?? new ModuleFactoryLocator();
+    this._platformLocator = this._platformLocator ?? this.params.platformLocator ?? new ModuleFactoryLocator2();
     return this._platformLocator;
   }
   get possibleRoot() {
@@ -858,16 +1074,16 @@ var XyOsDapp = class extends XyOsContextBase {
     return await this._bootMutex.runExclusive(async () => {
       console.log("XyOsDapp:boot:start", wallet.address, this.dapp.id);
       assertEx6(this._root === void 0, () => "Dapp already booted");
-      const finalLocator = locator ? (this.params.locator ?? new ModuleFactoryLocator2()).merge(locator) : this.params.locator ?? new ModuleFactoryLocator2();
+      const finalLocator = locator ? (this.params.locator ?? new ModuleFactoryLocator3()).merge(locator) : this.params.locator ?? new ModuleFactoryLocator3();
       console.log("XyOsDapp:boot:finalLocator", finalLocator);
-      const dappNodesWrapper = new ManifestWrapper({
+      const dappNodesWrapper = new ManifestWrapper2({
         ...this.manifest,
         schema: DappPackageManifestPayloadSchema
       }, wallet, finalLocator);
       const dappNodes = await dappNodesWrapper.loadNodes();
       const dappManifestWallet = await wallet.derivePath("99999");
       dapp_window_manifest_default.nodes[0].config.name = this.dapp.name + "Root";
-      const wrapper = new ManifestWrapper({
+      const wrapper = new ManifestWrapper2({
         ...dapp_window_manifest_default,
         schema: DappPackageManifestPayloadSchema
       }, dappManifestWallet, finalLocator);
@@ -886,210 +1102,29 @@ var XyOsDapp = class extends XyOsContextBase {
   }
 };
 
-// src/classes/system/ManageSystemDapps.ts
-import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
-import semver from "semver";
-
-// src/classes/system/Queries.ts
-import { PayloadDivinerQuerySchema as PayloadDivinerQuerySchema3 } from "@xyo-network/diviner-payload-model";
-import { DappConfigSchema, DappIconSchema, DappWidgetConfigSchema, UnregisteredDappAccessSchema } from "@xyo-network/os-model";
-import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
-var SystemDappQueries = {
-  async getDappAccess(diviner, name, version) {
-    const accessQuery = {
-      order: "desc",
-      registeringDappId: name,
-      schema: PayloadDivinerQuerySchema3,
-      schemas: [
-        UnregisteredDappAccessSchema
-      ],
-      version
-    };
-    return await diviner.divine([
-      accessQuery
-    ]);
-  },
-  async getLatestConfig(diviner, name) {
-    const configQuery = {
-      limit: 1,
-      name,
-      order: "desc",
-      schema: PayloadDivinerQuerySchema3,
-      schemas: [
-        DappConfigSchema
-      ]
-    };
-    const [dappConfig] = await diviner.divine([
-      configQuery
-    ]);
-    return dappConfig;
-  },
-  async getLatestIcon(diviner, name, version) {
-    const iconQuery = {
-      name,
-      order: "desc",
-      schema: PayloadDivinerQuerySchema3,
-      schemas: [
-        DappIconSchema
-      ],
-      version
-    };
-    const [dappIcon] = await diviner.divine([
-      iconQuery
-    ]);
-    return dappIcon;
-  },
-  async getWidgetConfigs(diviner, name, version) {
-    const widgetConfigQuery = {
-      dappId: name,
-      order: "desc",
-      schema: PayloadDivinerQuerySchema3,
-      schemas: [
-        DappWidgetConfigSchema
-      ],
-      version
-    };
-    const widgetConfigs = await diviner.divine([
-      widgetConfigQuery
-    ]);
-    const uniqueConfigs = {};
-    for (const widgetConfig of widgetConfigs) {
-      const hash = await PayloadBuilder2.dataHash(widgetConfig);
-      uniqueConfigs[widgetConfig.mode ?? hash] = widgetConfig;
-    }
-    return Object.values(uniqueConfigs);
-  }
-};
-
-// src/classes/system/ManageSystemDapps.ts
-var ManageSystemDapps = class extends OsCallerBase {
-  static {
-    __name(this, "ManageSystemDapps");
-  }
-  defaultSystemNames;
-  defaultSystemDapps;
-  defaultSystemDappParams;
-  locator;
-  developmentMode;
-  onErrorCallbacks;
-  constructor(context, defaultSystemNames, defaultSystemDapps, defaultSystemDappParams, locator, developmentMode) {
-    super(context), this.defaultSystemNames = defaultSystemNames, this.defaultSystemDapps = defaultSystemDapps, this.defaultSystemDappParams = defaultSystemDappParams, this.locator = locator, this.developmentMode = developmentMode, this.onErrorCallbacks = [];
-  }
-  /**
-  * Add a callback to listen for errors throwing during system dapp registration
-  * @param  {ErrorListener} errorListener
-  */
-  addErrorListener(errorListener) {
-    this.onErrorCallbacks.push(errorListener);
-  }
-  /**
-  * Installs the dapps into the OS and builds the appropriate DappSet
-  */
-  async install() {
-    await this.insertPayloads();
-    return await this.latestSets();
-  }
-  async freshInstall(archivist) {
-    await archivist.insert(this.defaultSystemDapps);
-  }
-  async insertPayloads() {
-    const archivist = this.developmentMode ? await this.getDappsArchivistDevelopment() : await this.getDappsArchivist();
-    try {
-      const allPayloads = await archivist.all();
-      if (allPayloads.length === 0) {
-        await this.freshInstall(archivist);
-        return true;
-      }
-      for (const systemDappPayload of this.defaultSystemDapps) {
-        try {
-          const validSemver = semver.valid(systemDappPayload.version);
-          if (!validSemver) throw new Error("semver is a valid type (string) but was not able to be parsed");
-        } catch (e) {
-          console.error(`${systemDappPayload.version} does not appear to be a valid semver value`, e);
-          continue;
-        }
-        const [existing] = await archivist.get([
-          await PayloadBuilder3.dataHash(systemDappPayload)
-        ]);
-        if (existing) continue;
-        await archivist.insert([
-          systemDappPayload
-        ]);
-      }
-      return true;
-    } catch (e) {
-      console.error("error installing system dapps");
-      throw e;
-    }
-  }
-  async latestSets() {
-    const diviner = this.developmentMode ? await this.getDappsArchivistPayloadDivinerDevelopment() : await this.getDappsArchivistPayloadDiviner();
-    const dappSets = [];
-    const failedPayloads = [];
-    for (const name of this.defaultSystemNames) {
-      try {
-        const dappConfig = await SystemDappQueries.getLatestConfig(diviner, name);
-        if (!dappConfig) {
-          console.error(`No config found for dapp ${name}`);
-          continue;
-        }
-        const dappIcon = await SystemDappQueries.getLatestIcon(diviner, name, dappConfig.version);
-        if (!dappIcon) {
-          console.error(`No icon found for dapp ${dappConfig.name}`);
-          failedPayloads.push(dappConfig);
-          continue;
-        }
-        const dappAccess = await SystemDappQueries.getDappAccess(diviner, name, dappConfig.version);
-        const dappParams = this.defaultSystemDappParams[dappConfig.name];
-        if (!dappParams) {
-          console.error(`No params found for dapp ${dappConfig.name}.  Did you forget to add it to OsDappParams?`);
-          failedPayloads.push(dappConfig);
-          continue;
-        }
-        const dappWidgetConfigs = await SystemDappQueries.getWidgetConfigs(diviner, name, dappConfig.version);
-        dappSets.push({
-          dapp: {
-            accessors: dappAccess,
-            config: dappConfig,
-            icon: dappIcon,
-            params: dappParams,
-            widgetConfigs: dappWidgetConfigs
-          }
-        });
-      } catch {
-        console.error(`Failed to build dapp ${name}`);
-      }
-    }
-    if (failedPayloads.length > 0) {
-      for (const cb of this.onErrorCallbacks) cb(failedPayloads);
-    }
-    return dappSets;
-  }
-};
-
-// src/classes/registration/DappRegistry.ts
+// src/registration/DappRegistry.ts
 import { HDWallet as HDWallet3 } from "@xyo-network/account";
 import { DappRegisteredSchema, DappRegisteredState, isRegisteredDappAccess } from "@xyo-network/os-model";
 
-// src/classes/registration/ValidateDappAccessDiviner/Config.ts
+// src/registration/ValidateDappAccessDiviner/Config.ts
 import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
 var FailedAccessorSchema = "network.xyo.os.failed.accessor.registration";
 var isFailedAccessor = isPayloadOfSchemaType(FailedAccessorSchema);
 var ValidateDappAccessDivinerConfigSchema = "network.xyo.os.dapp.access.registration.validate";
 
-// src/classes/registration/ValidateDappAccessDiviner/Diviner.ts
+// src/registration/ValidateDappAccessDiviner/Diviner.ts
 import { HDWallet as HDWallet2 } from "@xyo-network/account";
 import { AbstractDiviner } from "@xyo-network/diviner-abstract";
-import { ManifestWrapper as ManifestWrapper2, PackageManifestPayloadSchema } from "@xyo-network/manifest";
+import { ManifestWrapper as ManifestWrapper3, PackageManifestPayloadSchema } from "@xyo-network/manifest";
 import { isDappPackageManifestPayload, isUnregisteredDappAccess, RegisteredDappAccessSchema } from "@xyo-network/os-model";
 
-// src/access-interfaces/ValidDappAccessInterfaces.ts
+// src/models/access/ValidDappAccessInterfaces.ts
 import { RegisteredNames, RegisteredNamesInterface } from "@xyo-network/os-model";
 var ValidDappAccessInterfaces = {
   [RegisteredNames]: RegisteredNamesInterface
 };
 
-// src/classes/registration/ValidateDappAccessDiviner/Diviner.ts
+// src/registration/ValidateDappAccessDiviner/Diviner.ts
 var ValidateDappAccessDiviner = class extends AbstractDiviner {
   static {
     __name(this, "ValidateDappAccessDiviner");
@@ -1176,11 +1211,11 @@ var getNodeChildren = /* @__PURE__ */ __name(async (manifestToTest, dappParams)
   return children;
 }, "getNodeChildren");
 var getNodeToTest = /* @__PURE__ */ __name(async (manifestToTest, dappParams) => {
-  const dappManifestWrapper = new ManifestWrapper2(manifestToTest, await HDWallet2.random(), dappParams.locator);
+  const dappManifestWrapper = new ManifestWrapper3(manifestToTest, await HDWallet2.random(), dappParams.locator);
   return await dappManifestWrapper.loadNodes();
 }, "getNodeToTest");
 
-// src/classes/registration/DappRegistry.ts
+// src/registration/DappRegistry.ts
 var DappRegistry = class {
   static {
     __name(this, "DappRegistry");
@@ -1276,7 +1311,7 @@ var DappRegistry = class {
   }
 };
 
-// src/classes/registration/DappRegistrationService.ts
+// src/registration/DappRegistrationService.ts
 var DappRegistrationService = class {
   static {
     __name(this, "DappRegistrationService");
@@ -1302,7 +1337,7 @@ var DappRegistrationService = class {
     dappNames: [],
     dappParams: {},
     dappPayloads: []
-  }, locator = new ModuleFactoryLocator3(), developmentMode) {
+  }, locator = new ModuleFactoryLocator4(), developmentMode) {
     this.context = context;
     this.params = params;
     this.locator = locator;
@@ -1398,7 +1433,7 @@ var DappRegistrationService = class {
   }
 };
 
-// src/classes/signer/Signers.ts
+// src/signer/Signers.ts
 import { assertEx as assertEx7 } from "@xylabs/assert";
 import { HDWallet as HDWallet4 } from "@xyo-network/account";
 var Signers = class {
@@ -1449,39 +1484,6 @@ var Signers = class {
   }
 };
 
-// src/loadOsNode.ts
-import { IndexedDbArchivist } from "@xyo-network/archivist-indexeddb";
-import { IndexedDbPayloadDiviner } from "@xyo-network/diviner-payload-indexeddb";
-import { ManifestWrapper as ManifestWrapper3 } from "@xyo-network/manifest-wrapper";
-import { ModuleFactoryLocator as ModuleFactoryLocator4 } from "@xyo-network/module-factory-locator";
-var OS_NODE_PATH = "1'";
-var getDefaultOsNodeLocator = /* @__PURE__ */ __name(() => {
-  const locator = new ModuleFactoryLocator4();
-  locator.register(IndexedDbArchivist, {
-    "network.xyo.archivist.persistence.scope": "device"
-  });
-  locator.register(IndexedDbPayloadDiviner, {
-    "network.xyo.archivist.persistence.scope": "device"
-  });
-  return locator;
-}, "getDefaultOsNodeLocator");
-var loadOsNode = /* @__PURE__ */ __name(async (osWallet, locator) => {
-  try {
-    const osNodeWallet = await osWallet.derivePath(OS_NODE_PATH);
-    const osNodeLocator = locator ?? getDefaultOsNodeLocator();
-    const manifestWrapper = new ManifestWrapper3(os_node_manifest_default, osNodeWallet, osNodeLocator);
-    const osNode = (await manifestWrapper.loadNodes())[0];
-    return [
-      osNode
-    ];
-  } catch (e) {
-    const error = e;
-    console.error(`Error creating os node: ${error.message}`);
-    console.error(`Error creating os node: ${error.stack}`);
-    throw new Error(`Error creating os node: ${error.message}`);
-  }
-}, "loadOsNode");
-
 // src/stack/Base.ts
 import { assertEx as assertEx8 } from "@xylabs/assert";
 import { forget as forget3 } from "@xylabs/forget";