@dxos/client-services 0.4.7-main.731b147 → 0.4.7-main.76c1dea

package/dist/lib/node/{chunk-BIYZDTFF.cjs → chunk-7A7AEJZG.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_BIYZDTFF_exports = {};
-__export(chunk_BIYZDTFF_exports, {
+var chunk_7A7AEJZG_exports = {};
+__export(chunk_7A7AEJZG_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -60,7 +60,7 @@ __export(chunk_BIYZDTFF_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_BIYZDTFF_exports);
+module.exports = __toCommonJS(chunk_7A7AEJZG_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -100,6 +100,7 @@ var import_log3 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials5 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_timeframe = require("@dxos/timeframe");
 var import_tracing2 = require("@dxos/tracing");
 var import_util3 = require("@dxos/util");
@@ -186,7 +187,7 @@ var import_keys9 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
-var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
+var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
 var import_util6 = require("@dxos/util");
 var import_credentials13 = require("@dxos/credentials");
 var import_debug4 = require("@dxos/debug");
@@ -204,6 +205,7 @@ var import_context9 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_invariant14 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
@@ -227,7 +229,7 @@ var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context10 = require("@dxos/context");
 var import_document_model2 = require("@dxos/document-model");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
-var import_echo_schema = require("@dxos/echo-schema");
+var import_echo_schema2 = require("@dxos/echo-schema");
 var import_invariant16 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
 var import_log15 = require("@dxos/log");
@@ -242,9 +244,11 @@ var import_util9 = require("@dxos/util");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 var import_async16 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
+var import_invariant17 = require("@dxos/invariant");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async17 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
+var import_keys12 = require("@dxos/keys");
 var import_log16 = require("@dxos/log");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util10 = require("@dxos/util");
@@ -682,17 +686,18 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
 var Identity = class {
-  constructor({ space, signer, identityKey, deviceKey }) {
+  constructor({ space, signer, identityKey, deviceKey, presence }) {
     this.stateUpdate = new import_async5.Event();
     this.space = space;
     this._signer = signer;
+    this._presence = presence;
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
     import_log2.log.trace("dxos.halo.device", {
       deviceKey
     }, {
       F: __dxlog_file2,
-      L: 63,
+      L: 67,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -750,6 +755,9 @@ var Identity = class {
   get deviceCredentialChain() {
     return this._deviceStateMachine.deviceCredentialChain;
   }
+  get presence() {
+    return this._presence;
+  }
   /**
   * Issues credentials as identity.
   * Requires identity to be ready.
@@ -757,7 +765,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     (0, import_invariant.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file2,
-      L: 136,
+      L: 144,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -781,7 +789,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file2,
-      L: 152,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -842,15 +850,20 @@ function _ts_decorate2(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
+var DEVICE_PRESENCE_ANNOUNCE_INTERVAL = 1e4;
+var DEVICE_PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var IdentityManager = class {
   // TODO(burdon): IdentityManagerParams.
   // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
-  constructor(_metadataStore, _keyring, _feedStore, _spaceManager) {
+  constructor(_metadataStore, _keyring, _feedStore, _spaceManager, params) {
     this._metadataStore = _metadataStore;
     this._keyring = _keyring;
     this._feedStore = _feedStore;
     this._spaceManager = _spaceManager;
     this.stateUpdate = new import_async6.Event();
+    const { devicePresenceAnnounceInterval = DEVICE_PRESENCE_ANNOUNCE_INTERVAL, devicePresenceOfflineTimeout = DEVICE_PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
+    this._devicePresenceAnnounceInterval = devicePresenceAnnounceInterval;
+    this._devicePresenceOfflineTimeout = devicePresenceOfflineTimeout;
   }
   get identity() {
     return this._identity;
@@ -861,7 +874,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 84,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -870,7 +883,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 87,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -883,7 +896,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file3,
-        L: 92,
+        L: 112,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -893,7 +906,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 99,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -904,7 +917,7 @@ var IdentityManager = class {
   async createIdentity({ displayName, deviceProfile } = {}) {
     (0, import_invariant2.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 108,
+      L: 128,
       S: this,
       A: [
         "!this._identity",
@@ -913,7 +926,7 @@ var IdentityManager = class {
     });
     (0, import_log3.log)("creating identity...", void 0, {
       F: __dxlog_file3,
-      L: 109,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -934,7 +947,7 @@ var IdentityManager = class {
       const generator = new import_credentials4.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       (0, import_invariant2.invariant)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file3,
-        L: 128,
+        L: 148,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -943,7 +956,7 @@ var IdentityManager = class {
       });
       (0, import_invariant2.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file3,
-        L: 129,
+        L: 149,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -982,7 +995,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 171,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -993,7 +1006,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file3,
-      L: 177,
+      L: 197,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1030,13 +1043,13 @@ var IdentityManager = class {
       params
     }, {
       F: __dxlog_file3,
-      L: 215,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 216,
+      L: 236,
       S: this,
       A: [
         "!this._identity",
@@ -1064,7 +1077,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 235,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1078,7 +1091,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file3,
-      L: 245,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1090,7 +1103,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     (0, import_invariant2.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 253,
+      L: 273,
       S: this,
       A: [
         "this._identity",
@@ -1121,7 +1134,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     (0, import_invariant2.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 270,
+      L: 290,
       S: this,
       A: [
         "this._identity",
@@ -1150,13 +1163,14 @@ var IdentityManager = class {
     return {
       deviceKey: this._identity.deviceKey,
       kind: import_services.DeviceKind.CURRENT,
+      presence: import_services.Device.PresenceState.ONLINE,
       profile
     };
   }
   async _constructIdentity(identityRecord) {
     (0, import_invariant2.invariant)(!this._identity, void 0, {
       F: __dxlog_file3,
-      L: 291,
+      L: 316,
       S: this,
       A: [
         "!this._identity",
@@ -1167,13 +1181,22 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 292,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
+    const gossip = new import_teleport_extension_gossip.Gossip({
+      localPeerId: identityRecord.deviceKey
+    });
+    const presence = new import_teleport_extension_gossip.Presence({
+      announceInterval: this._devicePresenceAnnounceInterval,
+      offlineTimeout: this._devicePresenceOfflineTimeout,
+      identityKey: identityRecord.deviceKey,
+      gossip
+    });
     (0, import_invariant2.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 295,
+      L: 330,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -1185,7 +1208,7 @@ var IdentityManager = class {
     });
     (0, import_invariant2.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 299,
+      L: 334,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -1203,12 +1226,14 @@ var IdentityManager = class {
         credentialProvider: createAuthProvider((0, import_credentials4.createCredentialSignerWithKey)(this._keyring, identityRecord.deviceKey)),
         credentialAuthenticator: (0, import_util3.deferFunction)(() => identity.authVerifier.verifier)
       },
+      gossip,
       identityKey: identityRecord.identityKey
     });
     await space.setControlFeed(controlFeed);
-    space.setDataFeed(dataFeed);
+    void space.setDataFeed(dataFeed);
     const identity = new Identity({
       space,
+      presence,
       signer: this._keyring,
       identityKey: identityRecord.identityKey,
       deviceKey: identityRecord.deviceKey
@@ -1217,7 +1242,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file3,
-      L: 323,
+      L: 360,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1227,19 +1252,22 @@ var IdentityManager = class {
     identity.stateUpdate.on(() => this.stateUpdate.emit());
     return identity;
   }
-  async _constructSpace({ spaceRecord, swarmIdentity, identityKey }) {
+  async _constructSpace({ spaceRecord, swarmIdentity, identityKey, gossip }) {
     return this._spaceManager.constructSpace({
       metadata: {
         key: spaceRecord.key,
         genesisFeedKey: spaceRecord.genesisFeedKey
       },
       swarmIdentity,
-      onAuthorizedConnection: () => {
+      onAuthorizedConnection: (session) => {
+        session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
+          remotePeerId: session.remotePeerId
+        }));
       },
       onAuthFailure: () => {
         import_log3.log.warn("auth failure", void 0, {
           F: __dxlog_file3,
-          L: 343,
+          L: 385,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2756,7 +2784,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.4.7-main.731b147";
+var DXOS_VERSION = "0.4.7-main.76c1dea";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
@@ -3715,7 +3743,7 @@ var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DataSpaceManager = class {
-  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost) {
+  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost, params) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._dataServiceSubscriptions = _dataServiceSubscriptions;
@@ -3728,6 +3756,9 @@ var DataSpaceManager = class {
     this._spaces = new import_util6.ComplexMap(import_keys9.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys9.PublicKey.random().toHex();
+    const { spaceMemberPresenceAnnounceInterval = PRESENCE_ANNOUNCE_INTERVAL, spaceMemberPresenceOfflineTimeout = PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
+    this._spaceMemberPresenceAnnounceInterval = spaceMemberPresenceAnnounceInterval;
+    this._spaceMemberPresenceOfflineTimeout = spaceMemberPresenceOfflineTimeout;
   }
   // TODO(burdon): Remove.
   get spaces() {
@@ -3736,7 +3767,7 @@ var DataSpaceManager = class {
   async open() {
     (0, import_log11.log)("open", void 0, {
       F: __dxlog_file13,
-      L: 90,
+      L: 105,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3744,7 +3775,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 91,
+      L: 106,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3752,7 +3783,7 @@ var DataSpaceManager = class {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file13,
-      L: 92,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3762,7 +3793,7 @@ var DataSpaceManager = class {
           spaceMetadata
         }, {
           F: __dxlog_file13,
-          L: 96,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3773,7 +3804,7 @@ var DataSpaceManager = class {
           err
         }, {
           F: __dxlog_file13,
-          L: 99,
+          L: 114,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3790,7 +3821,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 112,
+      L: 127,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3798,7 +3829,7 @@ var DataSpaceManager = class {
   async close() {
     (0, import_log11.log)("close", void 0, {
       F: __dxlog_file13,
-      L: 117,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3814,7 +3845,7 @@ var DataSpaceManager = class {
   async createSpace() {
     (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 130,
+      L: 145,
       S: this,
       A: [
         "this._isOpen",
@@ -3835,7 +3866,7 @@ var DataSpaceManager = class {
       spaceKey
     }, {
       F: __dxlog_file13,
-      L: 142,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3851,7 +3882,7 @@ var DataSpaceManager = class {
     const memberCredential = credentials[1];
     (0, import_invariant12.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file13,
-      L: 155,
+      L: 170,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3869,13 +3900,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file13,
-      L: 167,
+      L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 168,
+      L: 183,
       S: this,
       A: [
         "this._isOpen",
@@ -3884,7 +3915,7 @@ var DataSpaceManager = class {
     });
     (0, import_invariant12.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 169,
+      L: 184,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3919,16 +3950,16 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 202,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
-    const gossip = new import_teleport_extension_gossip.Gossip({
+    const gossip = new import_teleport_extension_gossip2.Gossip({
       localPeerId: this._signingContext.deviceKey
     });
-    const presence = new import_teleport_extension_gossip.Presence({
-      announceInterval: PRESENCE_ANNOUNCE_INTERVAL,
-      offlineTimeout: PRESENCE_OFFLINE_TIMEOUT,
+    const presence = new import_teleport_extension_gossip2.Presence({
+      announceInterval: this._spaceMemberPresenceAnnounceInterval,
+      offlineTimeout: this._spaceMemberPresenceOfflineTimeout,
       identityKey: this._signingContext.identityKey,
       gossip
     });
@@ -3957,7 +3988,7 @@ var DataSpaceManager = class {
       onAuthFailure: () => {
         import_log11.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 239,
+          L: 254,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3981,7 +4012,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 257,
+            L: 272,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3993,7 +4024,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 264,
+            L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4006,7 +4037,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 270,
+            L: 285,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4241,9 +4272,7 @@ var SpacesServiceImpl = class {
         return {
           identity: {
             identityKey: member.key,
-            profile: {
-              displayName: member.profile?.displayName
-            }
+            profile: member.profile ?? {}
           },
           presence: member.removed ? import_services11.SpaceMember.PresenceState.REMOVED : isMe || peers.length > 0 ? import_services11.SpaceMember.PresenceState.ONLINE : import_services11.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
@@ -4268,16 +4297,20 @@ function _ts_decorate6(decorators, target, key, desc) {
 }
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class {
-  constructor(storage, networkManager, signalManager, modelFactory) {
+  constructor(storage, networkManager, signalManager, modelFactory, _runtimeParams) {
     this.storage = storage;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this.modelFactory = modelFactory;
+    this._runtimeParams = _runtimeParams;
     this.initialized = new import_async14.Trigger();
     this.dataServiceSubscriptions = new import_echo_pipeline2.DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys10.PublicKey.random().toHex();
     this.metadataStore = new import_echo_pipeline2.MetadataStore(storage.createDirectory("metadata"));
+    this.indexMetadata = new import_echo_schema.IndexMetadataStore({
+      directory: storage.createDirectory("index-metadata")
+    });
     this.snapshotStore = new import_echo_pipeline2.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
@@ -4299,8 +4332,11 @@ var ServiceContext = class {
       modelFactory: this.modelFactory,
       snapshotStore: this.snapshotStore
     });
-    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
-    this.automergeHost = new import_echo_pipeline2.AutomergeHost(storage.createDirectory("automerge"));
+    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
+    this.automergeHost = new import_echo_pipeline2.AutomergeHost({
+      directory: storage.createDirectory("automerge"),
+      metadata: this.indexMetadata
+    });
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(import_services12.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
   }
@@ -4308,7 +4344,7 @@ var ServiceContext = class {
     await this._checkStorageVersion();
     (0, import_log13.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 133,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4316,7 +4352,7 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 134,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4332,13 +4368,13 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 144,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 145,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4346,7 +4382,7 @@ var ServiceContext = class {
   async close() {
     (0, import_log13.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 149,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4364,7 +4400,7 @@ var ServiceContext = class {
     await this.metadataStore.close();
     (0, import_log13.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 162,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4378,7 +4414,7 @@ var ServiceContext = class {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant14.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 173,
+      L: 192,
       S: this,
       A: [
         "factory",
@@ -4410,7 +4446,7 @@ var ServiceContext = class {
   async _initialize(ctx) {
     (0, import_log13.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 204,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4428,12 +4464,12 @@ var ServiceContext = class {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore, this.automergeHost);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore, this.automergeHost, this._runtimeParams);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services12.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant14.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 228,
+        L: 248,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4457,7 +4493,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 244,
+            L: 264,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4468,7 +4504,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 248,
+            L: 268,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4479,7 +4515,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 253,
+            L: 273,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4490,7 +4526,7 @@ var ServiceContext = class {
         } catch (err) {
           import_log13.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 259,
+            L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4628,6 +4664,7 @@ var toStorageType = (type) => {
       throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
   }
 };
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -4644,22 +4681,58 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
+          (0, import_invariant17.invariant)(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file17,
+            L: 32,
+            S: this,
+            A: [
+              "this._identityManager.identity?.presence",
+              "'presence not present'"
+            ]
+          });
+          const peers = this._identityManager.identity.presence.getPeersOnline();
           next({
-            devices: Array.from(deviceKeys.entries()).map(([key, profile]) => ({
-              deviceKey: key,
-              kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services14.DeviceKind.CURRENT : import_services14.DeviceKind.TRUSTED,
-              profile
-            }))
+            devices: Array.from(deviceKeys.entries()).map(([key, profile]) => {
+              const isMe = this._identityManager.identity?.deviceKey.equals(key);
+              const peerState = peers.find((peer) => peer.identityKey.equals(key));
+              return {
+                deviceKey: key,
+                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services14.DeviceKind.CURRENT : import_services14.DeviceKind.TRUSTED,
+                profile,
+                presence: isMe ? import_services14.Device.PresenceState.ONLINE : peerState ? import_services14.Device.PresenceState.ONLINE : import_services14.Device.PresenceState.OFFLINE
+              };
+            })
           });
         }
       };
+      let identitySubscribed = false;
+      let presenceSubscribed = false;
+      const subscribeIdentity = () => {
+        if (!identitySubscribed) {
+          this._identityManager.identity?.stateUpdate.on(() => {
+            update();
+          });
+          identitySubscribed = true;
+        }
+      };
+      const subscribePresence = () => {
+        if (!presenceSubscribed) {
+          this._identityManager.identity?.presence?.updated.on(() => {
+            update();
+          });
+          presenceSubscribed = true;
+        }
+      };
       const subscriptions = new import_async16.EventSubscriptions();
+      if (this._identityManager.identity) {
+        subscribeIdentity();
+        subscribePresence();
+      }
       subscriptions.add(this._identityManager.stateUpdate.on(() => {
         update();
         if (this._identityManager.identity) {
-          subscriptions.add(this._identityManager.identity.stateUpdate.on(() => {
-            update();
-          }));
+          subscribeIdentity();
+          subscribePresence();
         }
       }));
       update();
@@ -4670,7 +4743,8 @@ var DevicesServiceImpl = class {
 var LoggingServiceImpl = class {
   constructor() {
     this._logs = new import_async17.Event();
-    this._started = /* @__PURE__ */ new Date();
+    this._started = Date.now();
+    this._sessionId = import_keys12.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -4746,7 +4820,12 @@ var LoggingServiceImpl = class {
           meta: {
             // TODO(dmaretskyi): Fix proto.
             file: entry2.meta?.F ?? "",
-            line: entry2.meta?.L ?? 0
+            line: entry2.meta?.L ?? 0,
+            scope: {
+              hostSessionId: this._sessionId,
+              uptimeSeconds: (Date.now() - this._started) / 1e3,
+              name: (0, import_util10.getDebugName)(entry2.meta?.S)
+            }
           }
         };
         try {
@@ -4869,7 +4948,7 @@ function _ts_decorate8(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var createDefaultModelFactory = () => {
   return new import_model_factory.ModelFactory().registerModel(import_document_model2.DocumentModel).registerModel(import_text_model.TextModel);
 };
@@ -4882,7 +4961,8 @@ var ClientServicesHost = class {
     storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
-    callbacks
+    callbacks,
+    runtimeParams
   } = {}) {
     this._tracingService = import_tracing7.TRACE_PROCESSOR.createTraceSender();
     this._statusUpdate = new import_async15.Event();
@@ -4891,6 +4971,7 @@ var ClientServicesHost = class {
     this._storage = storage;
     this._modelFactory = modelFactory;
     this._callbacks = callbacks;
+    this._runtimeParams = runtimeParams;
     if (config) {
       this.initialize({
         config,
@@ -4958,8 +5039,8 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     (0, import_invariant16.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file17,
-      L: 186,
+      F: __dxlog_file18,
+      L: 190,
       S: this,
       A: [
         "!this._open",
@@ -4967,15 +5048,15 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_log15.log)("initializing...", void 0, {
-      F: __dxlog_file17,
-      L: 187,
+      F: __dxlog_file18,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant16.invariant)(!this._config, "config already set", {
-        F: __dxlog_file17,
-        L: 190,
+        F: __dxlog_file18,
+        L: 194,
         S: this,
         A: [
           "!this._config",
@@ -4992,8 +5073,8 @@ var ClientServicesHost = class {
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     (0, import_invariant16.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file17,
-      L: 206,
+      F: __dxlog_file18,
+      L: 210,
       S: this,
       A: [
         "!this._networkManager",
@@ -5006,8 +5087,8 @@ var ClientServicesHost = class {
       signalManager
     });
     (0, import_log15.log)("initialized", void 0, {
-      F: __dxlog_file17,
-      L: 213,
+      F: __dxlog_file18,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5020,14 +5101,14 @@ var ClientServicesHost = class {
     import_log15.log.trace("dxos.client-services.host.open", import_protocols14.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 224,
+      F: __dxlog_file18,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant16.invariant)(this._config, "config not set", {
-      F: __dxlog_file17,
-      L: 226,
+      F: __dxlog_file18,
+      L: 230,
       S: this,
       A: [
         "this._config",
@@ -5035,8 +5116,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant16.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file17,
-      L: 227,
+      F: __dxlog_file18,
+      L: 231,
       S: this,
       A: [
         "this._storage",
@@ -5044,8 +5125,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant16.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file17,
-      L: 228,
+      F: __dxlog_file18,
+      L: 232,
       S: this,
       A: [
         "this._signalManager",
@@ -5053,8 +5134,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant16.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file17,
-      L: 229,
+      F: __dxlog_file18,
+      L: 233,
       S: this,
       A: [
         "this._networkManager",
@@ -5065,14 +5146,14 @@ var ClientServicesHost = class {
     (0, import_log15.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file17,
-      L: 232,
+      F: __dxlog_file18,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._resourceLock?.acquire();
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
+    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory, this._runtimeParams);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
@@ -5111,16 +5192,16 @@ var ClientServicesHost = class {
     (0, import_log15.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file17,
-      L: 305,
+      F: __dxlog_file18,
+      L: 310,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log15.log.trace("dxos.client-services.host.open", import_protocols14.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 306,
+      F: __dxlog_file18,
+      L: 311,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5133,8 +5214,8 @@ var ClientServicesHost = class {
     (0, import_log15.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file17,
-      L: 317,
+      F: __dxlog_file18,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5149,8 +5230,8 @@ var ClientServicesHost = class {
     (0, import_log15.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file17,
-      L: 324,
+      F: __dxlog_file18,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5160,30 +5241,30 @@ var ClientServicesHost = class {
     import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols14.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 329,
+      F: __dxlog_file18,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log15.log)("resetting...", void 0, {
-      F: __dxlog_file17,
-      L: 331,
+      F: __dxlog_file18,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
     (0, import_log15.log)("reset", void 0, {
-      F: __dxlog_file17,
-      L: 334,
+      F: __dxlog_file18,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols14.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 335,
+      F: __dxlog_file18,
+      L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5197,8 +5278,8 @@ var ClientServicesHost = class {
     obj[import_client_protocol5.defaultKey] = identity.identityKey.toHex();
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant16.invariant)(automergeIndex, void 0, {
-      F: __dxlog_file17,
-      L: 350,
+      F: __dxlog_file18,
+      L: 355,
       S: this,
       A: [
         "automergeIndex",
@@ -5210,8 +5291,8 @@ var ClientServicesHost = class {
     document.change((doc) => {
       (0, import_util9.assignDeep)(doc, [
         "objects",
-        obj[import_echo_schema.base]._id
-      ], (0, import_echo_schema.getRawDoc)(obj).handle.docSync());
+        (0, import_echo_schema2.getAutomergeObjectCore)(obj).id
+      ], (0, import_echo_schema2.getRawDoc)(obj).handle.docSync());
     });
     return identity;
   }
@@ -5267,4 +5348,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-BIYZDTFF.cjs.map
+//# sourceMappingURL=chunk-7A7AEJZG.cjs.map