@dxos/client-services 0.4.7-main.731b147 → 0.4.7-main.772b4a3

package/dist/lib/browser/{chunk-XPIRHRIB.mjs → chunk-KGSDIFCK.mjs}

@@ -483,17 +483,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 Event();
     this.space = space;
     this._signer = signer;
+    this._presence = presence;
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
     log2.trace("dxos.halo.device", {
       deviceKey
     }, {
       F: __dxlog_file2,
-      L: 63,
+      L: 67,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -551,6 +552,9 @@ var Identity = class {
   get deviceCredentialChain() {
     return this._deviceStateMachine.deviceCredentialChain;
   }
+  get presence() {
+    return this._presence;
+  }
   /**
   * Issues credentials as identity.
   * Requires identity to be ready.
@@ -558,7 +562,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     invariant(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file2,
-      L: 136,
+      L: 144,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -582,7 +586,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file2,
-      L: 152,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -642,8 +646,9 @@ import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/protocols";
-import { DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
+import { Device, DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed2, DeviceType } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
 import { Timeframe } from "@dxos/timeframe";
 import { trace as Trace } from "@dxos/tracing";
 import { isNode, deferFunction } from "@dxos/util";
@@ -658,15 +663,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 Event2();
+    const { devicePresenceAnnounceInterval = DEVICE_PRESENCE_ANNOUNCE_INTERVAL, devicePresenceOfflineTimeout = DEVICE_PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
+    this._devicePresenceAnnounceInterval = devicePresenceAnnounceInterval;
+    this._devicePresenceOfflineTimeout = devicePresenceOfflineTimeout;
   }
   get identity() {
     return this._identity;
@@ -677,7 +687,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 84,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -686,7 +696,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 87,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -699,7 +709,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file3,
-        L: 92,
+        L: 112,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -709,7 +719,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 99,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -720,7 +730,7 @@ var IdentityManager = class {
   async createIdentity({ displayName, deviceProfile } = {}) {
     invariant2(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 108,
+      L: 128,
       S: this,
       A: [
         "!this._identity",
@@ -729,7 +739,7 @@ var IdentityManager = class {
     });
     log3("creating identity...", void 0, {
       F: __dxlog_file3,
-      L: 109,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -750,7 +760,7 @@ var IdentityManager = class {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       invariant2(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file3,
-        L: 128,
+        L: 148,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -759,7 +769,7 @@ var IdentityManager = class {
       });
       invariant2(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file3,
-        L: 129,
+        L: 149,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -798,7 +808,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 171,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -809,7 +819,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file3,
-      L: 177,
+      L: 197,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -846,13 +856,13 @@ var IdentityManager = class {
       params
     }, {
       F: __dxlog_file3,
-      L: 215,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 216,
+      L: 236,
       S: this,
       A: [
         "!this._identity",
@@ -880,7 +890,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 235,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -894,7 +904,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file3,
-      L: 245,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -906,7 +916,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     invariant2(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 253,
+      L: 273,
       S: this,
       A: [
         "this._identity",
@@ -937,7 +947,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     invariant2(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 270,
+      L: 290,
       S: this,
       A: [
         "this._identity",
@@ -966,13 +976,14 @@ var IdentityManager = class {
     return {
       deviceKey: this._identity.deviceKey,
       kind: DeviceKind.CURRENT,
+      presence: Device.PresenceState.ONLINE,
       profile
     };
   }
   async _constructIdentity(identityRecord) {
     invariant2(!this._identity, void 0, {
       F: __dxlog_file3,
-      L: 291,
+      L: 316,
       S: this,
       A: [
         "!this._identity",
@@ -983,13 +994,22 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 292,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
+    const gossip = new Gossip({
+      localPeerId: identityRecord.deviceKey
+    });
+    const presence = new Presence({
+      announceInterval: this._devicePresenceAnnounceInterval,
+      offlineTimeout: this._devicePresenceOfflineTimeout,
+      identityKey: identityRecord.deviceKey,
+      gossip
+    });
     invariant2(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 295,
+      L: 330,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -1001,7 +1021,7 @@ var IdentityManager = class {
     });
     invariant2(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 299,
+      L: 334,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -1019,12 +1039,14 @@ var IdentityManager = class {
         credentialProvider: createAuthProvider(createCredentialSignerWithKey2(this._keyring, identityRecord.deviceKey)),
         credentialAuthenticator: 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
@@ -1033,7 +1055,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file3,
-      L: 323,
+      L: 360,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1043,19 +1065,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: () => {
         log3.warn("auth failure", void 0, {
           F: __dxlog_file3,
-          L: 343,
+          L: 385,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2646,7 +2671,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.7-main.731b147";
+var DXOS_VERSION = "0.4.7-main.772b4a3";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -3574,7 +3599,7 @@ import { PublicKey as PublicKey9 } from "@dxos/keys";
 import { log as log11 } from "@dxos/log";
 import { trace as trace7 } from "@dxos/protocols";
 import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
-import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
+import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extension-gossip";
 import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
@@ -3662,7 +3687,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;
@@ -3675,6 +3700,9 @@ var DataSpaceManager = class {
     this._spaces = new ComplexMap3(PublicKey9.hash);
     this._isOpen = false;
     this._instanceId = PublicKey9.random().toHex();
+    const { spaceMemberPresenceAnnounceInterval = PRESENCE_ANNOUNCE_INTERVAL, spaceMemberPresenceOfflineTimeout = PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
+    this._spaceMemberPresenceAnnounceInterval = spaceMemberPresenceAnnounceInterval;
+    this._spaceMemberPresenceOfflineTimeout = spaceMemberPresenceOfflineTimeout;
   }
   // TODO(burdon): Remove.
   get spaces() {
@@ -3683,7 +3711,7 @@ var DataSpaceManager = class {
   async open() {
     log11("open", void 0, {
       F: __dxlog_file13,
-      L: 90,
+      L: 105,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3691,7 +3719,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 91,
+      L: 106,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3699,7 +3727,7 @@ var DataSpaceManager = class {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file13,
-      L: 92,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3709,7 +3737,7 @@ var DataSpaceManager = class {
           spaceMetadata
         }, {
           F: __dxlog_file13,
-          L: 96,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3720,7 +3748,7 @@ var DataSpaceManager = class {
           err
         }, {
           F: __dxlog_file13,
-          L: 99,
+          L: 114,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3737,7 +3765,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 112,
+      L: 127,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3745,7 +3773,7 @@ var DataSpaceManager = class {
   async close() {
     log11("close", void 0, {
       F: __dxlog_file13,
-      L: 117,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3761,7 +3789,7 @@ var DataSpaceManager = class {
   async createSpace() {
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 130,
+      L: 145,
       S: this,
       A: [
         "this._isOpen",
@@ -3782,7 +3810,7 @@ var DataSpaceManager = class {
       spaceKey
     }, {
       F: __dxlog_file13,
-      L: 142,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3798,7 +3826,7 @@ var DataSpaceManager = class {
     const memberCredential = credentials[1];
     invariant11(getCredentialAssertion2(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'",
@@ -3816,13 +3844,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file13,
-      L: 167,
+      L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 168,
+      L: 183,
       S: this,
       A: [
         "this._isOpen",
@@ -3831,7 +3859,7 @@ var DataSpaceManager = class {
     });
     invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 169,
+      L: 184,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3866,16 +3894,16 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 202,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
-    const gossip = new Gossip({
+    const gossip = new Gossip2({
       localPeerId: this._signingContext.deviceKey
     });
-    const presence = new Presence({
-      announceInterval: PRESENCE_ANNOUNCE_INTERVAL,
-      offlineTimeout: PRESENCE_OFFLINE_TIMEOUT,
+    const presence = new Presence2({
+      announceInterval: this._spaceMemberPresenceAnnounceInterval,
+      offlineTimeout: this._spaceMemberPresenceOfflineTimeout,
       identityKey: this._signingContext.identityKey,
       gossip
     });
@@ -3904,7 +3932,7 @@ var DataSpaceManager = class {
       onAuthFailure: () => {
         log11.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 239,
+          L: 254,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3928,7 +3956,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 257,
+            L: 272,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3940,7 +3968,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 264,
+            L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3953,7 +3981,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 270,
+            L: 285,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4197,9 +4225,7 @@ var SpacesServiceImpl = class {
         return {
           identity: {
             identityKey: member.key,
-            profile: {
-              displayName: member.profile?.displayName
-            }
+            profile: member.profile ?? {}
           },
           presence: member.removed ? SpaceMember3.PresenceState.REMOVED : isMe || peers.length > 0 ? SpaceMember3.PresenceState.ONLINE : SpaceMember3.PresenceState.OFFLINE,
           peerStates: peers
@@ -4219,6 +4245,7 @@ import { Context as Context9 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore, AutomergeHost } from "@dxos/echo-pipeline";
+import { IndexMetadataStore } from "@dxos/echo-schema";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
@@ -4241,16 +4268,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 Trigger5();
     this.dataServiceSubscriptions = new DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = PublicKey10.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
+    this.indexMetadata = new IndexMetadataStore({
+      directory: storage.createDirectory("index-metadata")
+    });
     this.snapshotStore = new SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new BlobStore(storage.createDirectory("blobs"));
     this.keyring = new Keyring(storage.createDirectory("keyring"));
@@ -4272,8 +4303,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 AutomergeHost(storage.createDirectory("automerge"));
+    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
+    this.automergeHost = new AutomergeHost({
+      directory: storage.createDirectory("automerge"),
+      metadata: this.indexMetadata
+    });
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
   }
@@ -4281,7 +4315,7 @@ var ServiceContext = class {
     await this._checkStorageVersion();
     log13("opening...", void 0, {
       F: __dxlog_file15,
-      L: 133,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4289,7 +4323,7 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 134,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4305,13 +4339,13 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 144,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
     log13("opened", void 0, {
       F: __dxlog_file15,
-      L: 145,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4319,7 +4353,7 @@ var ServiceContext = class {
   async close() {
     log13("closing...", void 0, {
       F: __dxlog_file15,
-      L: 149,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4337,7 +4371,7 @@ var ServiceContext = class {
     await this.metadataStore.close();
     log13("closed", void 0, {
       F: __dxlog_file15,
-      L: 162,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4351,7 +4385,7 @@ var ServiceContext = class {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 173,
+      L: 192,
       S: this,
       A: [
         "factory",
@@ -4383,7 +4417,7 @@ var ServiceContext = class {
   async _initialize(ctx) {
     log13("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 204,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4401,12 +4435,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(Invitation6.Kind.SPACE, (invitation) => {
       invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 228,
+        L: 248,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4430,7 +4464,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 244,
+            L: 264,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4441,7 +4475,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 248,
+            L: 268,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4452,7 +4486,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 253,
+            L: 273,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4463,7 +4497,7 @@ var ServiceContext = class {
         } catch (err) {
           log13.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 259,
+            L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4687,9 +4721,9 @@ import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protoc
 import { Context as Context10 } from "@dxos/context";
 import { DocumentModel as DocumentModel2 } from "@dxos/document-model";
 import { DataServiceImpl } from "@dxos/echo-pipeline";
-import { base, getRawDoc } from "@dxos/echo-schema";
-import { invariant as invariant14 } from "@dxos/invariant";
-import { PublicKey as PublicKey11 } from "@dxos/keys";
+import { getRawDoc, getAutomergeObjectCore } from "@dxos/echo-schema";
+import { invariant as invariant15 } from "@dxos/invariant";
+import { PublicKey as PublicKey12 } from "@dxos/keys";
 import { log as log16 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { ModelFactory } from "@dxos/model-factory";
@@ -4704,7 +4738,9 @@ import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
-import { DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
+import { invariant as invariant14 } from "@dxos/invariant";
+import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
+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;
@@ -4721,22 +4757,58 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
+          invariant14(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) ? DeviceKind2.CURRENT : DeviceKind2.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) ? DeviceKind2.CURRENT : DeviceKind2.TRUSTED,
+                profile,
+                presence: isMe ? Device2.PresenceState.ONLINE : peerState ? Device2.PresenceState.ONLINE : Device2.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 EventSubscriptions3();
+      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();
@@ -4748,13 +4820,15 @@ var DevicesServiceImpl = class {
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event7 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
+import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { getContextFromEntry, log as log15 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
-import { jsonify, numericalValues, tracer } from "@dxos/util";
+import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
 var LoggingServiceImpl = class {
   constructor() {
     this._logs = new Event7();
-    this._started = /* @__PURE__ */ new Date();
+    this._started = Date.now();
+    this._sessionId = PublicKey11.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -4830,7 +4904,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: getDebugName(entry2.meta?.S)
+            }
           }
         };
         try {
@@ -4963,7 +5042,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 ModelFactory().registerModel(DocumentModel2).registerModel(TextModel);
 };
@@ -4976,7 +5055,8 @@ var ClientServicesHost = class {
     storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
-    callbacks
+    callbacks,
+    runtimeParams
   } = {}) {
     this._tracingService = TRACE_PROCESSOR2.createTraceSender();
     this._statusUpdate = new Event8();
@@ -4985,6 +5065,7 @@ var ClientServicesHost = class {
     this._storage = storage;
     this._modelFactory = modelFactory;
     this._callbacks = callbacks;
+    this._runtimeParams = runtimeParams;
     if (config) {
       this.initialize({
         config,
@@ -5051,9 +5132,9 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    invariant14(!this._open, "service host is open", {
-      F: __dxlog_file17,
-      L: 186,
+    invariant15(!this._open, "service host is open", {
+      F: __dxlog_file18,
+      L: 190,
       S: this,
       A: [
         "!this._open",
@@ -5061,15 +5142,15 @@ var ClientServicesHost = class {
       ]
     });
     log16("initializing...", void 0, {
-      F: __dxlog_file17,
-      L: 187,
+      F: __dxlog_file18,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      invariant14(!this._config, "config already set", {
-        F: __dxlog_file17,
-        L: 190,
+      invariant15(!this._config, "config already set", {
+        F: __dxlog_file18,
+        L: 194,
         S: this,
         A: [
           "!this._config",
@@ -5085,9 +5166,9 @@ var ClientServicesHost = class {
       iceServers: this._config?.get("runtime.services.ice")
     }), signalManager = new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    invariant14(!this._networkManager, "network manager already set", {
-      F: __dxlog_file17,
-      L: 206,
+    invariant15(!this._networkManager, "network manager already set", {
+      F: __dxlog_file18,
+      L: 210,
       S: this,
       A: [
         "!this._networkManager",
@@ -5100,8 +5181,8 @@ var ClientServicesHost = class {
       signalManager
     });
     log16("initialized", void 0, {
-      F: __dxlog_file17,
-      L: 213,
+      F: __dxlog_file18,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5110,45 +5191,45 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey11.random().toHex();
+    const traceId = PublicKey12.random().toHex();
     log16.trace("dxos.client-services.host.open", trace9.begin({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 224,
+      F: __dxlog_file18,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant14(this._config, "config not set", {
-      F: __dxlog_file17,
-      L: 226,
+    invariant15(this._config, "config not set", {
+      F: __dxlog_file18,
+      L: 230,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    invariant14(this._storage, "storage not set", {
-      F: __dxlog_file17,
-      L: 227,
+    invariant15(this._storage, "storage not set", {
+      F: __dxlog_file18,
+      L: 231,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    invariant14(this._signalManager, "signal manager not set", {
-      F: __dxlog_file17,
-      L: 228,
+    invariant15(this._signalManager, "signal manager not set", {
+      F: __dxlog_file18,
+      L: 232,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    invariant14(this._networkManager, "network manager not set", {
-      F: __dxlog_file17,
-      L: 229,
+    invariant15(this._networkManager, "network manager not set", {
+      F: __dxlog_file18,
+      L: 233,
       S: this,
       A: [
         "this._networkManager",
@@ -5159,14 +5240,14 @@ var ClientServicesHost = class {
     log16("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)),
@@ -5205,16 +5286,16 @@ var ClientServicesHost = class {
     log16("opened", {
       deviceKey
     }, {
-      F: __dxlog_file17,
-      L: 305,
+      F: __dxlog_file18,
+      L: 310,
       S: this,
       C: (f, a) => f(...a)
     });
     log16.trace("dxos.client-services.host.open", trace9.end({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 306,
+      F: __dxlog_file18,
+      L: 311,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5227,8 +5308,8 @@ var ClientServicesHost = class {
     log16("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file17,
-      L: 317,
+      F: __dxlog_file18,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5243,41 +5324,41 @@ var ClientServicesHost = class {
     log16("closed", {
       deviceKey
     }, {
-      F: __dxlog_file17,
-      L: 324,
+      F: __dxlog_file18,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = PublicKey11.random().toHex();
+    const traceId = PublicKey12.random().toHex();
     log16.trace("dxos.sdk.client-services-host.reset", trace9.begin({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 329,
+      F: __dxlog_file18,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
     log16("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();
     log16("reset", void 0, {
-      F: __dxlog_file17,
-      L: 334,
+      F: __dxlog_file18,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
     log16.trace("dxos.sdk.client-services-host.reset", trace9.end({
       id: traceId
     }), {
-      F: __dxlog_file17,
-      L: 335,
+      F: __dxlog_file18,
+      L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5290,9 +5371,9 @@ var ClientServicesHost = class {
     const obj = new Properties(void 0);
     obj[defaultKey] = identity.identityKey.toHex();
     const automergeIndex = space.automergeSpaceState.rootUrl;
-    invariant14(automergeIndex, void 0, {
-      F: __dxlog_file17,
-      L: 350,
+    invariant15(automergeIndex, void 0, {
+      F: __dxlog_file18,
+      L: 355,
       S: this,
       A: [
         "automergeIndex",
@@ -5304,7 +5385,7 @@ var ClientServicesHost = class {
     document.change((doc) => {
       assignDeep(doc, [
         "objects",
-        obj[base]._id
+        getAutomergeObjectCore(obj).id
       ], getRawDoc(obj).handle.docSync());
     });
     return identity;
@@ -5362,4 +5443,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-XPIRHRIB.mjs.map
+//# sourceMappingURL=chunk-KGSDIFCK.mjs.map