@dxos/client-services 0.1.30-next.7c60cd3 → 0.1.30

package/dist/lib/node/index.cjs

@@ -30,57 +30,39 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // packages/sdk/client-services/src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  AUTHENTICATION_CODE_LENGTH: () => AUTHENTICATION_CODE_LENGTH,
-  AbstractInvitationsHandler: () => AbstractInvitationsHandler,
-  AbstractInvitationsProxy: () => AbstractInvitationsProxy,
   AbstractInvitationsService: () => AbstractInvitationsService,
-  AuthenticatingInvitationProvider: () => AuthenticatingInvitationProvider,
   ClientServicesHost: () => ClientServicesHost,
-  ClientServicesProxy: () => ClientServicesProxy,
   DeviceInvitationsHandler: () => DeviceInvitationsHandler,
-  DeviceInvitationsProxy: () => DeviceInvitationsProxy,
   DeviceInvitationsServiceImpl: () => DeviceInvitationsServiceImpl,
   DevtoolsHostEvents: () => DevtoolsHostEvents,
   DevtoolsServiceImpl: () => DevtoolsServiceImpl,
   IFrameHostRuntime: () => IFrameHostRuntime,
   IFrameProxyRuntime: () => IFrameProxyRuntime,
-  INVITATION_TIMEOUT: () => INVITATION_TIMEOUT,
   Identity: () => Identity,
   IdentityManager: () => IdentityManager,
   IdentityServiceImpl: () => IdentityServiceImpl,
-  InvitationEncoder: () => InvitationEncoder,
-  InvitationObservableProvider: () => InvitationObservableProvider,
   LocalClientServices: () => LocalClientServices,
   MemoryShellRuntime: () => MemoryShellRuntime,
-  ON_CLOSE_DELAY: () => ON_CLOSE_DELAY,
   ServiceContext: () => ServiceContext,
   ServiceRegistry: () => ServiceRegistry,
-  ShellController: () => ShellController,
   ShellRuntimeImpl: () => ShellRuntimeImpl,
   SpaceInvitationsHandler: () => SpaceInvitationsHandler,
-  SpaceInvitationsProxy: () => SpaceInvitationsProxy,
   SpaceInvitationsServiceImpl: () => SpaceInvitationsServiceImpl,
   TrustedKeySetAuthVerifier: () => TrustedKeySetAuthVerifier,
   VaultResourceLock: () => VaultResourceLock,
   WorkerRuntime: () => WorkerRuntime,
   WorkerSession: () => WorkerSession,
-  appServiceBundle: () => appServiceBundle,
-  clientServiceBundle: () => clientServiceBundle,
   createAuthProvider: () => createAuthProvider,
-  createDefaultModelFactory: () => createDefaultModelFactory,
   createStorageObjects: () => createStorageObjects,
+  fromHost: () => fromHost,
   getNetworkPeers: () => getNetworkPeers,
-  iframeServiceBundle: () => iframeServiceBundle,
-  shellServiceBundle: () => shellServiceBundle,
   subscribeToFeedBlocks: () => subscribeToFeedBlocks,
   subscribeToFeeds: () => subscribeToFeeds,
   subscribeToNetworkStatus: () => subscribeToNetworkStatus,
   subscribeToNetworkTopics: () => subscribeToNetworkTopics,
   subscribeToSignal: () => subscribeToSignal,
   subscribeToSpaces: () => subscribeToSpaces,
-  subscribeToSwarmInfo: () => subscribeToSwarmInfo,
-  workerServiceBundle: () => workerServiceBundle,
-  wrapObservable: () => wrapObservable
+  subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -888,84 +870,20 @@ var IdentityServiceImpl = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/invitations/encoder.ts
-var import_base_x = __toESM(require("base-x"));
-var import_protocols2 = require("@dxos/protocols");
-var base62 = (0, import_base_x.default)("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
-var codec = import_protocols2.schema.getCodecForType("dxos.client.services.Invitation");
-var InvitationEncoder = class {
-  static decode(text) {
-    return codec.decode(base62.decode(text));
-  }
-  static encode(invitation) {
-    return base62.encode(codec.encode(invitation));
-  }
-};
-
 // packages/sdk/client-services/src/packlets/invitations/device-invitations-handler.ts
-var import_node_assert5 = __toESM(require("node:assert"));
-var import_async7 = require("@dxos/async");
+var import_node_assert4 = __toESM(require("node:assert"));
+var import_async6 = require("@dxos/async");
+var import_client = require("@dxos/client");
 var import_context3 = require("@dxos/context");
 var import_credentials7 = require("@dxos/credentials");
 var import_keys4 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_network_manager = require("@dxos/network-manager");
-var import_protocols3 = require("@dxos/protocols");
-var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols2 = require("@dxos/protocols");
+var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
-
-// packages/sdk/client-services/src/packlets/invitations/invitations.ts
-var import_node_assert4 = __toESM(require("node:assert"));
-var import_async6 = require("@dxos/async");
-var import_services = require("@dxos/protocols/proto/dxos/client/services");
-var AUTHENTICATION_CODE_LENGTH = 6;
-var INVITATION_TIMEOUT = 3 * 6e4;
-var ON_CLOSE_DELAY = 1e3;
-var InvitationObservableProvider = class extends import_async6.CancellableObservableProvider {
-  get invitation() {
-    return this._invitation;
-  }
-  setInvitation(invitation) {
-    this._invitation = invitation;
-  }
-};
-var AuthenticatingInvitationProvider = class extends InvitationObservableProvider {
-  // prettier-ignore
-  constructor(_actions) {
-    super(() => this._actions.onCancel());
-    this._actions = _actions;
-  }
-  async authenticate(authenticationCode) {
-    return this._actions.onAuthenticate(authenticationCode);
-  }
-};
-var wrapObservable = async (observable) => {
-  return new Promise((resolve, reject) => {
-    const unsubscribe = observable.subscribe({
-      onSuccess: (invitation) => {
-        (0, import_node_assert4.default)(invitation.state === import_services.Invitation.State.SUCCESS);
-        unsubscribe();
-        resolve(invitation);
-      },
-      onError: (err) => {
-        unsubscribe();
-        reject(err);
-      }
-    });
-  });
-};
-
-// packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
-var AbstractInvitationsHandler = class {
-  // prettier-ignore
-  constructor(_networkManager) {
-    this._networkManager = _networkManager;
-  }
-};
-
-// packages/sdk/client-services/src/packlets/invitations/device-invitations-handler.ts
-var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
+var DeviceInvitationsHandler = class extends import_client.AbstractInvitationsHandler {
   // prettier-ignore
   constructor(_params) {
     super(_params.networkManager);
@@ -975,14 +893,14 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
   * Creates an invitation and listens for a join request from the invited (guest) peer.
   */
   createInvitation(context, options) {
-    const { type, timeout = INVITATION_TIMEOUT, swarmKey } = options != null ? options : {};
-    (0, import_node_assert5.default)(type !== import_services2.Invitation.Type.OFFLINE);
+    const { type, timeout = import_client.INVITATION_TIMEOUT, swarmKey } = options != null ? options : {};
+    (0, import_node_assert4.default)(type !== import_services.Invitation.Type.OFFLINE);
     const identity = this._params.getIdentity();
     const invitation = {
       type,
       invitationId: import_keys4.PublicKey.random().toHex(),
       swarmKey: swarmKey != null ? swarmKey : import_keys4.PublicKey.random(),
-      authenticationCode: (0, import_credentials7.generatePasscode)(AUTHENTICATION_CODE_LENGTH)
+      authenticationCode: (0, import_credentials7.generatePasscode)(import_client.AUTHENTICATION_CODE_LENGTH)
     };
     const ctx = new import_context3.Context({
       onError: (err) => {
@@ -990,11 +908,11 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
         observable.callback.onError(err);
       }
     });
-    const observable = new InvitationObservableProvider(async () => {
+    const observable = new import_client.InvitationObservableProvider(async () => {
       await ctx.dispose();
     });
     let authenticationCode;
-    const complete = new import_async7.Trigger();
+    const complete = new import_async6.Trigger();
     const createExtension = () => new HostHaloInvitationExtension({
       requestAdmission: async () => {
         var _a, _b;
@@ -1002,7 +920,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
           host: identity.deviceKey
         }, {
           file: "device-invitations-handler.ts",
-          line: 91,
+          line: 92,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1018,7 +936,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
           authenticationCode: code
         }, {
           file: "device-invitations-handler.ts",
-          line: 105,
+          line: 106,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1030,7 +948,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
       // TODO(burdon): Not used: controlFeedKey, dataFeedKey.
       presentAdmissionCredentials: async (credentials) => {
         try {
-          if (invitation.type !== import_services2.Invitation.Type.INTERACTIVE_TESTING) {
+          if (invitation.type !== import_services.Invitation.Type.INTERACTIVE_TESTING) {
             if (invitation.authenticationCode === void 0 || invitation.authenticationCode !== authenticationCode) {
               throw new Error(`invalid authentication code: ${authenticationCode}`);
             }
@@ -1040,7 +958,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
             guest: credentials.deviceKey
           }, {
             file: "device-invitations-handler.ts",
-            line: 120,
+            line: 121,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1052,14 +970,14 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
         }
       },
       onOpen: () => {
-        (0, import_async7.scheduleTask)(ctx, async () => {
+        (0, import_async6.scheduleTask)(ctx, async () => {
           var _a, _b;
           try {
             (0, import_log4.log)("connected", {
               host: identity.deviceKey
             }, {
               file: "device-invitations-handler.ts",
-              line: 136,
+              line: 137,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1072,7 +990,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
               guest: deviceKey
             }, {
               file: "device-invitations-handler.ts",
-              line: 139,
+              line: 140,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1081,20 +999,20 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
             if (!observable.cancelled) {
               import_log4.log.error("failed", err, {
                 file: "device-invitations-handler.ts",
-                line: 143,
+                line: 144,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               observable.callback.onError(err);
             }
           } finally {
-            await (0, import_async7.sleep)(ON_CLOSE_DELAY);
+            await (0, import_async6.sleep)(import_client.ON_CLOSE_DELAY);
             await ctx.dispose();
           }
         });
       }
     });
-    (0, import_async7.scheduleTask)(ctx, async () => {
+    (0, import_async6.scheduleTask)(ctx, async () => {
       var _a, _b;
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
@@ -1116,15 +1034,15 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
   * which then writes the guest's credentials to the halo.
   */
   acceptInvitation(invitation, options) {
-    const { timeout = INVITATION_TIMEOUT } = options != null ? options : {};
+    const { timeout = import_client.INVITATION_TIMEOUT } = options != null ? options : {};
     const ctx = new import_context3.Context({
       onError: (err) => {
         void ctx.dispose();
         observable.callback.onError(err);
       }
     });
-    const authenticated = new import_async7.Trigger();
-    const observable = new AuthenticatingInvitationProvider({
+    const authenticated = new import_async6.Trigger();
+    const observable = new import_client.AuthenticatingInvitationProvider({
       onCancel: async () => {
         await ctx.dispose();
       },
@@ -1134,11 +1052,11 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
       }
     });
     let connectionCount = 0;
-    const complete = new import_async7.Trigger();
+    const complete = new import_async6.Trigger();
     const createExtension = () => {
       const extension = new GuestHaloInvitationExtension({
         onOpen: () => {
-          (0, import_async7.scheduleTask)(ctx, async () => {
+          (0, import_async6.scheduleTask)(ctx, async () => {
             var _a, _b, _c, _d;
             try {
               if (++connectionCount > 1) {
@@ -1146,22 +1064,22 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
               }
               (0, import_log4.log)("connected", {}, {
                 file: "device-invitations-handler.ts",
-                line: 214,
+                line: 215,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               (_b = (_a = observable.callback).onConnected) == null ? void 0 : _b.call(_a, invitation);
               (0, import_log4.log)("sending admission request", {}, {
                 file: "device-invitations-handler.ts",
-                line: 218,
+                line: 219,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               const { identityKey, haloSpaceKey, genesisFeedKey } = await extension.rpc.HaloHostService.requestAdmission();
-              if (invitation.type === void 0 || invitation.type === import_services2.Invitation.Type.INTERACTIVE) {
+              if (invitation.type === void 0 || invitation.type === import_services.Invitation.Type.INTERACTIVE) {
                 (0, import_log4.log)("guest waiting for authentication code...", {}, {
                   file: "device-invitations-handler.ts",
-                  line: 225,
+                  line: 226,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1171,7 +1089,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
                 });
                 (0, import_log4.log)("sending authentication request", {}, {
                   file: "device-invitations-handler.ts",
-                  line: 228,
+                  line: 229,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1189,7 +1107,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
                 dataFeedKey
               }, {
                 file: "device-invitations-handler.ts",
-                line: 237,
+                line: 238,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1211,7 +1129,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
                 identityKey
               }, {
                 file: "device-invitations-handler.ts",
-                line: 256,
+                line: 257,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1220,7 +1138,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
               if (!observable.cancelled) {
                 import_log4.log.warn("auth failed", err, {
                   file: "device-invitations-handler.ts",
-                  line: 260,
+                  line: 261,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1234,9 +1152,9 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
       });
       return extension;
     };
-    (0, import_async7.scheduleTask)(ctx, async () => {
+    (0, import_async6.scheduleTask)(ctx, async () => {
       var _a, _b;
-      (0, import_node_assert5.default)(invitation.swarmKey);
+      (0, import_node_assert4.default)(invitation.swarmKey);
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
@@ -1259,7 +1177,7 @@ var HostHaloInvitationExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       exposed: {
-        HaloHostService: import_protocols3.schema.getService("dxos.halo.invitations.HaloHostService")
+        HaloHostService: import_protocols2.schema.getService("dxos.halo.invitations.HaloHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1291,7 +1209,7 @@ var GuestHaloInvitationExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       requested: {
-        HaloHostService: import_protocols3.schema.getService("dxos.halo.invitations.HaloHostService")
+        HaloHostService: import_protocols2.schema.getService("dxos.halo.invitations.HaloHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1305,152 +1223,11 @@ var GuestHaloInvitationExtension = class extends import_teleport.RpcExtension {
   }
 };
 
-// packages/sdk/client-services/src/packlets/invitations/invitations-proxy.ts
-var import_node_assert6 = __toESM(require("node:assert"));
-var import_async8 = require("@dxos/async");
-var import_log5 = require("@dxos/log");
-var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
-var AbstractInvitationsProxy = class {
-  // prettier-ignore
-  constructor(_invitationsService) {
-    this._invitationsService = _invitationsService;
-  }
-  createInvitation(context, options) {
-    let invitationId;
-    const observable = new InvitationObservableProvider(async () => {
-      if (invitationId) {
-        await this._invitationsService.cancelInvitation({
-          invitationId
-        });
-      }
-    });
-    const invitation = {
-      ...this.getInvitationOptions(context),
-      ...options
-    };
-    const stream = this._invitationsService.createInvitation(invitation);
-    stream.subscribe((invitation2) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-      observable.setInvitation(invitation2);
-      switch (invitation2.state) {
-        case import_services3.Invitation.State.CONNECTING: {
-          (0, import_node_assert6.default)(invitation2.invitationId);
-          invitationId = invitation2.invitationId;
-          (_b = (_a = observable.callback).onConnecting) == null ? void 0 : _b.call(_a, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.CONNECTED: {
-          (_d = (_c = observable.callback).onConnected) == null ? void 0 : _d.call(_c, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.AUTHENTICATING: {
-          (_f = (_e = observable.callback).onAuthenticating) == null ? void 0 : _f.call(_e, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.SUCCESS: {
-          (_h = (_g = observable.callback).onSuccess) == null ? void 0 : _h.call(_g, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.CANCELLED: {
-          (_j = (_i = observable.callback).onCancelled) == null ? void 0 : _j.call(_i);
-          break;
-        }
-        default: {
-          import_log5.log.error(`Invalid state: ${invitation2.state}`, {}, {
-            file: "invitations-proxy.ts",
-            line: 81,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        }
-      }
-    }, (err) => {
-      if (err) {
-        (0, import_async8.observableError)(observable, err);
-      }
-    });
-    return observable;
-  }
-  acceptInvitation(invitation, options) {
-    (0, import_node_assert6.default)(invitation && invitation.swarmKey);
-    const observable = new AuthenticatingInvitationProvider({
-      onCancel: async () => {
-        var _a;
-        const invitationId = (_a = observable.invitation) == null ? void 0 : _a.invitationId;
-        (0, import_node_assert6.default)(invitationId);
-        await this._invitationsService.cancelInvitation({
-          invitationId
-        });
-      },
-      onAuthenticate: async (authenticationCode) => {
-        var _a;
-        const invitationId = (_a = observable.invitation) == null ? void 0 : _a.invitationId;
-        (0, import_node_assert6.default)(invitationId);
-        await this._invitationsService.authenticate({
-          invitationId,
-          authenticationCode
-        });
-      }
-    });
-    const stream = this._invitationsService.acceptInvitation({
-      ...invitation,
-      ...options
-    });
-    stream.subscribe((invitation2) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-      (0, import_node_assert6.default)(invitation2.invitationId);
-      observable.setInvitation(invitation2);
-      switch (invitation2.state) {
-        case import_services3.Invitation.State.CONNECTING: {
-          (_b = (_a = observable.callback).onConnecting) == null ? void 0 : _b.call(_a, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.CONNECTED: {
-          (_d = (_c = observable.callback).onConnected) == null ? void 0 : _d.call(_c, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.AUTHENTICATING: {
-          (_f = (_e = observable.callback).onAuthenticating) == null ? void 0 : _f.call(_e, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.SUCCESS: {
-          (_h = (_g = observable.callback).onSuccess) == null ? void 0 : _h.call(_g, invitation2);
-          break;
-        }
-        case import_services3.Invitation.State.CANCELLED: {
-          (_j = (_i = observable.callback).onCancelled) == null ? void 0 : _j.call(_i);
-          break;
-        }
-        default: {
-          import_log5.log.error(`Invalid state: ${invitation2.state}`, {}, {
-            file: "invitations-proxy.ts",
-            line: 146,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        }
-      }
-    }, (err) => {
-      if (err) {
-        (0, import_async8.observableError)(observable, err);
-      }
-    });
-    return observable;
-  }
-};
-
-// packages/sdk/client-services/src/packlets/invitations/device-invitations-proxy.ts
-var DeviceInvitationsProxy = class extends AbstractInvitationsProxy {
-  getInvitationOptions() {
-    return {};
-  }
-};
-
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
-var import_node_assert7 = __toESM(require("node:assert"));
+var import_node_assert5 = __toESM(require("node:assert"));
 var import_codec_protobuf7 = require("@dxos/codec-protobuf");
-var import_log6 = require("@dxos/log");
-var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
+var import_log5 = require("@dxos/log");
+var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
 var AbstractInvitationsService = class {
   // prettier-ignore
   constructor(_identityManager, _getInvitationsHandler) {
@@ -1470,9 +1247,9 @@ var AbstractInvitationsService = class {
     return new import_codec_protobuf7.Stream(({ next, close }) => {
       const invitationsHandler = this._getInvitationsHandler();
       const context = this.getContext(invitation);
-      (0, import_log6.log)("stream opened", this.getLoggingContext(), {
+      (0, import_log5.log)("stream opened", this.getLoggingContext(), {
         file: "invitations-service.ts",
-        line: 43,
+        line: 48,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1485,60 +1262,60 @@ var AbstractInvitationsService = class {
       });
       observable.subscribe({
         onConnecting: (invitation2) => {
-          (0, import_node_assert7.default)(invitation2.invitationId);
+          (0, import_node_assert5.default)(invitation2.invitationId);
           invitationId = invitation2.invitationId;
           this._createInvitations.set(invitation2.invitationId, observable);
-          invitation2.state = import_services4.Invitation.State.CONNECTING;
+          invitation2.state = import_services2.Invitation.State.CONNECTING;
           next(invitation2);
         },
         onConnected: (invitation2) => {
-          (0, import_node_assert7.default)(invitation2.invitationId);
-          invitation2.state = import_services4.Invitation.State.CONNECTED;
+          (0, import_node_assert5.default)(invitation2.invitationId);
+          invitation2.state = import_services2.Invitation.State.CONNECTED;
           next(invitation2);
         },
         onAuthenticating: (invitation2) => {
-          (0, import_node_assert7.default)(invitation2.invitationId);
-          invitation2.state = import_services4.Invitation.State.AUTHENTICATING;
+          (0, import_node_assert5.default)(invitation2.invitationId);
+          invitation2.state = import_services2.Invitation.State.AUTHENTICATING;
           next(invitation2);
         },
         onSuccess: (invitation2) => {
-          (0, import_node_assert7.default)(invitation2.invitationId);
-          invitation2.state = import_services4.Invitation.State.SUCCESS;
+          (0, import_node_assert5.default)(invitation2.invitationId);
+          invitation2.state = import_services2.Invitation.State.SUCCESS;
           next(invitation2);
           close();
         },
         onCancelled: () => {
-          (0, import_node_assert7.default)(invitationId);
+          (0, import_node_assert5.default)(invitationId);
           invitation.invitationId = invitationId;
-          invitation.state = import_services4.Invitation.State.CANCELLED;
+          invitation.state = import_services2.Invitation.State.CANCELLED;
           next(invitation);
           close();
         },
         onTimeout: (err) => {
-          invitation.state = import_services4.Invitation.State.TIMEOUT;
+          invitation.state = import_services2.Invitation.State.TIMEOUT;
           close(err);
         },
         onError: (err) => {
-          invitation.state = import_services4.Invitation.State.ERROR;
+          invitation.state = import_services2.Invitation.State.ERROR;
           close(err);
         }
       });
       return (err) => {
         const context2 = this.getLoggingContext();
         if (err) {
-          import_log6.log.warn("stream closed", {
+          import_log5.log.warn("stream closed", {
             ...context2,
             err
           }, {
             file: "invitations-service.ts",
-            line: 92,
+            line: 97,
             scope: this,
             callSite: (f, a) => f(...a)
           });
         } else {
-          (0, import_log6.log)("stream closed", context2, {
+          (0, import_log5.log)("stream closed", context2, {
             file: "invitations-service.ts",
-            line: 94,
+            line: 99,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1549,9 +1326,9 @@ var AbstractInvitationsService = class {
   }
   acceptInvitation(invitation, options) {
     return new import_codec_protobuf7.Stream(({ next, close }) => {
-      (0, import_log6.log)("stream opened", this.getLoggingContext(), {
+      (0, import_log5.log)("stream opened", this.getLoggingContext(), {
         file: "invitations-service.ts",
-        line: 104,
+        line: 109,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1560,59 +1337,59 @@ var AbstractInvitationsService = class {
       const observable = invitationsHandler.acceptInvitation(invitation, options);
       observable.subscribe({
         onConnecting: (invitation2) => {
-          (0, import_node_assert7.default)(invitation2.invitationId);
+          (0, import_node_assert5.default)(invitation2.invitationId);
           invitationId = invitation2.invitationId;
           this._acceptInvitations.set(invitation2.invitationId, observable);
-          invitation2.state = import_services4.Invitation.State.CONNECTING;
+          invitation2.state = import_services2.Invitation.State.CONNECTING;
           next(invitation2);
         },
         onConnected: (invitation2) => {
-          (0, import_node_assert7.default)(invitation2.invitationId);
-          invitation2.state = import_services4.Invitation.State.CONNECTED;
+          (0, import_node_assert5.default)(invitation2.invitationId);
+          invitation2.state = import_services2.Invitation.State.CONNECTED;
           next(invitation2);
         },
         onAuthenticating: (invitation2) => {
-          (0, import_node_assert7.default)(invitation2.invitationId);
-          invitation2.state = import_services4.Invitation.State.AUTHENTICATING;
+          (0, import_node_assert5.default)(invitation2.invitationId);
+          invitation2.state = import_services2.Invitation.State.AUTHENTICATING;
           next(invitation2);
         },
         onSuccess: (invitation2) => {
-          invitation2.state = import_services4.Invitation.State.SUCCESS;
+          invitation2.state = import_services2.Invitation.State.SUCCESS;
           next(invitation2);
           close();
         },
         onCancelled: () => {
-          (0, import_node_assert7.default)(invitationId);
+          (0, import_node_assert5.default)(invitationId);
           invitation.invitationId = invitationId;
-          invitation.state = import_services4.Invitation.State.CANCELLED;
+          invitation.state = import_services2.Invitation.State.CANCELLED;
           next(invitation);
           close();
         },
         onTimeout: (err) => {
-          invitation.state = import_services4.Invitation.State.TIMEOUT;
+          invitation.state = import_services2.Invitation.State.TIMEOUT;
           close(err);
         },
         onError: (err) => {
-          invitation.state = import_services4.Invitation.State.ERROR;
+          invitation.state = import_services2.Invitation.State.ERROR;
           close(err);
         }
       });
       return (err) => {
         const context = this.getLoggingContext();
         if (err) {
-          import_log6.log.warn("stream closed", {
+          import_log5.log.warn("stream closed", {
             ...context,
             err
           }, {
             file: "invitations-service.ts",
-            line: 152,
+            line: 157,
             scope: this,
             callSite: (f, a) => f(...a)
           });
         } else {
-          (0, import_log6.log)("stream closed", context, {
+          (0, import_log5.log)("stream closed", context, {
             file: "invitations-service.ts",
-            line: 154,
+            line: 159,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1622,20 +1399,20 @@ var AbstractInvitationsService = class {
     });
   }
   async authenticate({ invitationId, authenticationCode }) {
-    (0, import_log6.log)("authenticating...", {}, {
+    (0, import_log5.log)("authenticating...", {}, {
       file: "invitations-service.ts",
-      line: 163,
+      line: 168,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    (0, import_node_assert7.default)(invitationId);
+    (0, import_node_assert5.default)(invitationId);
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      import_log6.log.warn("invalid invitation", {
+      import_log5.log.warn("invalid invitation", {
         invitationId
       }, {
         file: "invitations-service.ts",
-        line: 167,
+        line: 172,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1645,20 +1422,20 @@ var AbstractInvitationsService = class {
   }
   async cancelInvitation(invitation) {
     var _a;
-    (0, import_log6.log)("cancelling...", {}, {
+    (0, import_log5.log)("cancelling...", {}, {
       file: "invitations-service.ts",
-      line: 174,
+      line: 179,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    (0, import_node_assert7.default)(invitation.invitationId);
+    (0, import_node_assert5.default)(invitation.invitationId);
     const observable = (_a = this._createInvitations.get(invitation.invitationId)) != null ? _a : this._acceptInvitations.get(invitation.invitationId);
     if (!observable) {
-      import_log6.log.warn("invalid invitation", {
+      import_log5.log.warn("invalid invitation", {
         invitationId: invitation.invitationId
       }, {
         file: "invitations-service.ts",
-        line: 179,
+        line: 184,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1680,20 +1457,21 @@ var DeviceInvitationsServiceImpl = class extends AbstractInvitationsService {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts
-var import_node_assert8 = __toESM(require("node:assert"));
-var import_async9 = require("@dxos/async");
+var import_node_assert6 = __toESM(require("node:assert"));
+var import_async7 = require("@dxos/async");
+var import_client2 = require("@dxos/client");
 var import_context4 = require("@dxos/context");
 var import_credentials8 = require("@dxos/credentials");
 var import_feed_store3 = require("@dxos/feed-store");
 var import_keys5 = require("@dxos/keys");
-var import_log7 = require("@dxos/log");
+var import_log6 = require("@dxos/log");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols4 = require("@dxos/protocols");
-var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
-var import_invitations4 = require("@dxos/protocols/proto/dxos/halo/invitations");
+var import_protocols3 = require("@dxos/protocols");
+var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
+var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport2 = require("@dxos/teleport");
 var MAX_OTP_ATTEMPTS = 3;
-var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
+var SpaceInvitationsHandler = class extends import_client2.AbstractInvitationsHandler {
   constructor(networkManager, _spaceManager, _signingContext, _keyring) {
     super(networkManager);
     this._spaceManager = _spaceManager;
@@ -1706,16 +1484,16 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
   createInvitation(space, options) {
     var _a;
     let swarmConnection;
-    const { type, timeout = INVITATION_TIMEOUT, swarmKey } = options != null ? options : {};
-    (0, import_node_assert8.default)(type !== import_services5.Invitation.Type.OFFLINE);
-    (0, import_node_assert8.default)(space);
+    const { type, timeout = import_client2.INVITATION_TIMEOUT, swarmKey } = options != null ? options : {};
+    (0, import_node_assert6.default)(type !== import_services3.Invitation.Type.OFFLINE);
+    (0, import_node_assert6.default)(space);
     const invitation = {
       type,
       invitationId: import_keys5.PublicKey.random().toHex(),
       swarmKey: swarmKey != null ? swarmKey : import_keys5.PublicKey.random(),
       spaceKey: space.key,
-      authMethod: (_a = options == null ? void 0 : options.authMethod) != null ? _a : import_invitations4.AuthMethod.SHARED_SECRET,
-      authenticationCode: (0, import_credentials8.generatePasscode)(AUTHENTICATION_CODE_LENGTH)
+      authMethod: (_a = options == null ? void 0 : options.authMethod) != null ? _a : import_invitations2.AuthMethod.SHARED_SECRET,
+      authenticationCode: (0, import_credentials8.generatePasscode)(import_client2.AUTHENTICATION_CODE_LENGTH)
       // TODO(dmaretskyi): Don't generate if authMethod === NONE .
     };
     const ctx = new import_context4.Context({
@@ -1724,18 +1502,18 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
         observable.callback.onError(err);
       }
     });
-    const observable = new InvitationObservableProvider(async () => {
+    const observable = new import_client2.InvitationObservableProvider(async () => {
       await (swarmConnection == null ? void 0 : swarmConnection.close());
     });
     let authenticationPassed = false;
     let authenticationRetry = 0;
     const createExtension = () => {
-      const complete = new import_async9.Trigger();
+      const complete = new import_async7.Trigger();
       let guestProfile;
       const hostInvitationExtension = new HostSpaceInvitationExtension({
         introduce: async ({ profile }) => {
           var _a2, _b;
-          (0, import_log7.log)("guest introduced itself", {
+          (0, import_log6.log)("guest introduced itself", {
             guestProfile: profile,
             host: this._signingContext.deviceKey,
             spaceKey: space.key
@@ -1748,12 +1526,12 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
           guestProfile = profile;
           (_b = (_a2 = observable.callback).onAuthenticating) == null ? void 0 : _b.call(_a2, invitation);
           return {
-            spaceKey: type === import_services5.Invitation.Type.INTERACTIVE_TESTING || type === import_services5.Invitation.Type.MULTIUSE_TESTING ? space.key : void 0,
+            spaceKey: type === import_services3.Invitation.Type.INTERACTIVE_TESTING || type === import_services3.Invitation.Type.MULTIUSE_TESTING ? space.key : void 0,
             authMethod: invitation.authMethod
           };
         },
         authenticate: async ({ authenticationCode: code }) => {
-          (0, import_log7.log)("received authentication request", {
+          (0, import_log6.log)("received authentication request", {
             authenticationCode: code
           }, {
             file: "space-invitations-handler.ts",
@@ -1761,25 +1539,25 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
             scope: this,
             callSite: (f, a) => f(...a)
           });
-          let status = import_invitations4.AuthenticationResponse.Status.OK;
+          let status = import_invitations2.AuthenticationResponse.Status.OK;
           switch (invitation.authMethod) {
-            case import_invitations4.AuthMethod.NONE: {
-              (0, import_log7.log)("authentication not required", {}, {
+            case import_invitations2.AuthMethod.NONE: {
+              (0, import_log6.log)("authentication not required", {}, {
                 file: "space-invitations-handler.ts",
                 line: 128,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               return {
-                status: import_invitations4.AuthenticationResponse.Status.OK
+                status: import_invitations2.AuthenticationResponse.Status.OK
               };
             }
-            case import_invitations4.AuthMethod.SHARED_SECRET: {
+            case import_invitations2.AuthMethod.SHARED_SECRET: {
               if (invitation.authenticationCode) {
                 if (authenticationRetry++ > MAX_OTP_ATTEMPTS) {
-                  status = import_invitations4.AuthenticationResponse.Status.INVALID_OPT_ATTEMPTS;
+                  status = import_invitations2.AuthenticationResponse.Status.INVALID_OPT_ATTEMPTS;
                 } else if (code !== invitation.authenticationCode) {
-                  status = import_invitations4.AuthenticationResponse.Status.INVALID_OTP;
+                  status = import_invitations2.AuthenticationResponse.Status.INVALID_OTP;
                 } else {
                   authenticationPassed = true;
                 }
@@ -1787,7 +1565,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               break;
             }
             default: {
-              import_log7.log.error("invalid authentication method", {
+              import_log6.log.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
                 file: "space-invitations-handler.ts",
@@ -1795,7 +1573,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
-              status = import_invitations4.AuthenticationResponse.Status.INTERNAL_ERROR;
+              status = import_invitations2.AuthenticationResponse.Status.INTERNAL_ERROR;
               break;
             }
           }
@@ -1808,7 +1586,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
             if (isAuthenticationRequired(invitation) && !authenticationPassed) {
               throw new Error("Not authenticated");
             }
-            (0, import_log7.log)("writing guest credentials", {
+            (0, import_log6.log)("writing guest credentials", {
               host: this._signingContext.deviceKey,
               guest: deviceKey
             }, {
@@ -1818,9 +1596,9 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               callSite: (f, a) => f(...a)
             });
             const credentials = await (0, import_credentials8.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
-            (0, import_node_assert8.default)(credentials[0].credential);
+            (0, import_node_assert6.default)(credentials[0].credential);
             const spaceMemberCredential = credentials[0].credential.credential;
-            (0, import_node_assert8.default)((0, import_credentials8.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+            (0, import_node_assert6.default)((0, import_credentials8.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
             await (0, import_feed_store3.writeMessages)(space.inner.controlPipeline.writer, credentials);
             complete.wake(deviceKey);
             return {
@@ -1832,10 +1610,10 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
           }
         },
         onOpen: () => {
-          (0, import_async9.scheduleTask)(ctx, async () => {
+          (0, import_async7.scheduleTask)(ctx, async () => {
             var _a2, _b;
             try {
-              (0, import_log7.log)("connected", {
+              (0, import_log6.log)("connected", {
                 host: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
@@ -1847,7 +1625,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               const deviceKey = await complete.wait({
                 timeout
               });
-              (0, import_log7.log)("admitted guest", {
+              (0, import_log6.log)("admitted guest", {
                 host: this._signingContext.deviceKey,
                 guest: deviceKey
               }, {
@@ -1859,7 +1637,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               observable.callback.onSuccess(invitation);
             } catch (err) {
               if (!observable.cancelled) {
-                import_log7.log.error("failed", err, {
+                import_log6.log.error("failed", err, {
                   file: "space-invitations-handler.ts",
                   line: 198,
                   scope: this,
@@ -1868,8 +1646,8 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 observable.callback.onError(err);
               }
             } finally {
-              if (type !== import_services5.Invitation.Type.MULTIUSE_TESTING) {
-                await (0, import_async9.sleep)(ON_CLOSE_DELAY);
+              if (type !== import_services3.Invitation.Type.MULTIUSE_TESTING) {
+                await (0, import_async7.sleep)(import_client2.ON_CLOSE_DELAY);
                 await ctx.dispose();
               }
             }
@@ -1878,7 +1656,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
       });
       return hostInvitationExtension;
     };
-    (0, import_async9.scheduleTask)(ctx, async () => {
+    (0, import_async7.scheduleTask)(ctx, async () => {
       var _a2, _b;
       const topic = invitation.swarmKey;
       const swarmConnection2 = await this._networkManager.joinSwarm({
@@ -1900,15 +1678,15 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
   * which then writes the guest's credentials to the space.
   */
   acceptInvitation(invitation, options) {
-    const { timeout = INVITATION_TIMEOUT } = options != null ? options : {};
+    const { timeout = import_client2.INVITATION_TIMEOUT } = options != null ? options : {};
     const ctx = new import_context4.Context({
       onError: (err) => {
         void ctx.dispose();
         observable.callback.onError(err);
       }
     });
-    const authenticated = new import_async9.Trigger();
-    const observable = new AuthenticatingInvitationProvider({
+    const authenticated = new import_async7.Trigger();
+    const observable = new import_client2.AuthenticatingInvitationProvider({
       onCancel: async () => {
         await ctx.dispose();
       },
@@ -1917,17 +1695,17 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
       }
     });
     let connectionCount = 0;
-    const complete = new import_async9.Trigger();
+    const complete = new import_async7.Trigger();
     const createExtension = () => {
       const extension = new GuestSpaceInvitationExtension({
         onOpen: () => {
-          (0, import_async9.scheduleTask)(ctx, async () => {
+          (0, import_async7.scheduleTask)(ctx, async () => {
             var _a, _b, _c, _d, _e, _f;
             try {
               if (++connectionCount > 1) {
                 throw new Error(`multiple connections detected: ${connectionCount}`);
               }
-              (0, import_log7.log)("connected", {
+              (0, import_log6.log)("connected", {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
@@ -1936,7 +1714,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 callSite: (f, a) => f(...a)
               });
               (_b = (_a = observable.callback).onConnected) == null ? void 0 : _b.call(_a, invitation);
-              (0, import_log7.log)("introduce", {
+              (0, import_log6.log)("introduce", {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
@@ -1947,7 +1725,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               const introductionResponse = await extension.rpc.SpaceHostService.introduce({
                 profile: this._signingContext.profile
               });
-              (0, import_log7.log)("introduce response", {
+              (0, import_log6.log)("introduce response", {
                 guest: this._signingContext.deviceKey,
                 response: introductionResponse
               }, {
@@ -1963,7 +1741,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               if (isAuthenticationRequired(invitation)) {
                 (_d = (_c = observable.callback).onAuthenticating) == null ? void 0 : _d.call(_c, invitation);
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-                  (0, import_log7.log)("guest waiting for authentication code...", {}, {
+                  (0, import_log6.log)("guest waiting for authentication code...", {}, {
                     file: "space-invitations-handler.ts",
                     line: 293,
                     scope: this,
@@ -1973,7 +1751,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                   const authenticationCode = await authenticated.wait({
                     timeout
                   });
-                  (0, import_log7.log)("sending authentication request", {}, {
+                  (0, import_log6.log)("sending authentication request", {}, {
                     file: "space-invitations-handler.ts",
                     line: 297,
                     scope: this,
@@ -1982,14 +1760,14 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                   const response = await extension.rpc.SpaceHostService.authenticate({
                     authenticationCode
                   });
-                  if (response.status === void 0 || response.status === import_invitations4.AuthenticationResponse.Status.OK) {
+                  if (response.status === void 0 || response.status === import_invitations2.AuthenticationResponse.Status.OK) {
                     break;
                   }
-                  if (response.status === import_invitations4.AuthenticationResponse.Status.INVALID_OTP) {
+                  if (response.status === import_invitations2.AuthenticationResponse.Status.INVALID_OTP) {
                     if (attempt === MAX_OTP_ATTEMPTS) {
                       throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
                     } else {
-                      (0, import_log7.log)("retrying invalid code", {
+                      (0, import_log6.log)("retrying invalid code", {
                         attempt
                       }, {
                         file: "space-invitations-handler.ts",
@@ -2004,7 +1782,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               }
               const controlFeedKey = await this._keyring.createKey();
               const dataFeedKey = await this._keyring.createKey();
-              (0, import_log7.log)("request admission", {
+              (0, import_log6.log)("request admission", {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
@@ -2019,14 +1797,14 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
                 dataFeedKey
               });
               const assertion = (0, import_credentials8.getCredentialAssertion)(credential);
-              (0, import_node_assert8.default)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential");
-              (0, import_node_assert8.default)(credential.subject.id.equals(this._signingContext.identityKey));
+              (0, import_node_assert6.default)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential");
+              (0, import_node_assert6.default)(credential.subject.id.equals(this._signingContext.identityKey));
               const space = await this._spaceManager.acceptSpace({
                 spaceKey: assertion.spaceKey,
                 genesisFeedKey: assertion.genesisFeedKey
               });
               await this._signingContext.recordCredential(credential);
-              (0, import_log7.log)("admitted by host", {
+              (0, import_log6.log)("admitted by host", {
                 guest: this._signingContext.deviceKey,
                 spaceKey: space.key
               }, {
@@ -2038,7 +1816,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
               complete.wake();
             } catch (err) {
               if (!observable.cancelled) {
-                import_log7.log.warn("auth failed", err, {
+                import_log6.log.warn("auth failed", err, {
                   file: "space-invitations-handler.ts",
                   line: 344,
                   scope: this,
@@ -2054,9 +1832,9 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
       });
       return extension;
     };
-    (0, import_async9.scheduleTask)(ctx, async () => {
+    (0, import_async7.scheduleTask)(ctx, async () => {
       var _a, _b;
-      (0, import_node_assert8.default)(invitation.swarmKey);
+      (0, import_node_assert6.default)(invitation.swarmKey);
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
@@ -2075,12 +1853,12 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler {
     return observable;
   }
 };
-var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_invitations4.AuthMethod.NONE && invitation.type !== import_services5.Invitation.Type.INTERACTIVE_TESTING && invitation.type !== import_services5.Invitation.Type.MULTIUSE_TESTING;
+var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_invitations2.AuthMethod.NONE && invitation.type !== import_services3.Invitation.Type.INTERACTIVE_TESTING && invitation.type !== import_services3.Invitation.Type.MULTIUSE_TESTING;
 var HostSpaceInvitationExtension = class extends import_teleport2.RpcExtension {
   constructor(_callbacks) {
     super({
       exposed: {
-        SpaceHostService: import_protocols4.schema.getService("dxos.halo.invitations.SpaceHostService")
+        SpaceHostService: import_protocols3.schema.getService("dxos.halo.invitations.SpaceHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -2111,7 +1889,7 @@ var GuestSpaceInvitationExtension = class extends import_teleport2.RpcExtension
   constructor(_callbacks) {
     super({
       requested: {
-        SpaceHostService: import_protocols4.schema.getService("dxos.halo.invitations.SpaceHostService")
+        SpaceHostService: import_protocols3.schema.getService("dxos.halo.invitations.SpaceHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -2125,17 +1903,8 @@ var GuestSpaceInvitationExtension = class extends import_teleport2.RpcExtension
   }
 };
 
-// packages/sdk/client-services/src/packlets/invitations/space-invitations-proxy.ts
-var SpaceInvitationsProxy = class extends AbstractInvitationsProxy {
-  getInvitationOptions(context) {
-    return {
-      spaceKey: context
-    };
-  }
-};
-
 // packages/sdk/client-services/src/packlets/invitations/space-invitations-service.ts
-var import_node_assert9 = __toESM(require("node:assert"));
+var import_node_assert7 = __toESM(require("node:assert"));
 var SpaceInvitationsServiceImpl = class extends AbstractInvitationsService {
   // prettier-ignore
   constructor(identityManager, invitationsHandler, _getSpaceManager) {
@@ -2144,36 +1913,118 @@ var SpaceInvitationsServiceImpl = class extends AbstractInvitationsService {
     this._getSpaceManager = _getSpaceManager;
   }
   getContext(invitation) {
-    (0, import_node_assert9.default)(invitation.spaceKey);
+    (0, import_node_assert7.default)(invitation.spaceKey);
     const spaceManager = this._getSpaceManager();
     const space = spaceManager.spaces.get(invitation.spaceKey);
-    (0, import_node_assert9.default)(space);
+    (0, import_node_assert7.default)(space);
     return space;
   }
 };
 
-// packages/sdk/client-services/src/packlets/services/service-context.ts
-var import_async13 = require("@dxos/async");
-var import_credentials11 = require("@dxos/credentials");
-var import_debug4 = require("@dxos/debug");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
-var import_feed_store4 = require("@dxos/feed-store");
-var import_keyring = require("@dxos/keyring");
-var import_log10 = require("@dxos/log");
+// packages/sdk/client-services/src/packlets/services/service-host.ts
+var import_node_assert12 = __toESM(require("node:assert"));
+var import_async19 = require("@dxos/async");
+var import_client6 = require("@dxos/client");
+var import_debug7 = require("@dxos/debug");
+var import_echo_pipeline5 = require("@dxos/echo-pipeline");
+var import_log15 = require("@dxos/log");
+var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
+
+// packages/sdk/client-services/src/packlets/deprecated/tracing.ts
+var TracingServiceImpl = class {
+  constructor(_config) {
+    this._config = _config;
+  }
+  async setTracingOptions() {
+    throw new Error("Tracing not available.");
+  }
+  subscribeToRpcTrace() {
+    throw new Error("Tracing not available.");
+  }
+};
+
+// packages/sdk/client-services/src/packlets/devices/devices-service.ts
+var import_async8 = require("@dxos/async");
+var import_codec_protobuf8 = require("@dxos/codec-protobuf");
+var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
+var DevicesServiceImpl = class {
+  constructor(_identityManager) {
+    this._identityManager = _identityManager;
+  }
+  updateDevice(request) {
+    throw new Error("Method not implemented.");
+  }
+  queryDevices() {
+    return new import_codec_protobuf8.Stream(({ next }) => {
+      const update = () => {
+        var _a;
+        const deviceKeys = (_a = this._identityManager.identity) == null ? void 0 : _a.authorizedDeviceKeys;
+        if (!deviceKeys) {
+          next({
+            devices: []
+          });
+        } else {
+          next({
+            devices: Array.from(deviceKeys.values()).map((key) => {
+              var _a2;
+              return {
+                deviceKey: key,
+                kind: ((_a2 = this._identityManager.identity) == null ? void 0 : _a2.deviceKey.equals(key)) ? import_services4.DeviceKind.CURRENT : import_services4.DeviceKind.TRUSTED
+              };
+            })
+          });
+        }
+      };
+      const subscriptions = new import_async8.EventSubscriptions();
+      subscriptions.add(this._identityManager.stateUpdate.on(() => {
+        update();
+        if (this._identityManager.identity) {
+          subscriptions.add(this._identityManager.identity.stateUpdate.on(() => {
+            update();
+          }));
+        }
+      }));
+      update();
+      return () => subscriptions.clear();
+    });
+  }
+};
+
+// packages/sdk/client-services/src/packlets/network/network-service.ts
+var import_codec_protobuf9 = require("@dxos/codec-protobuf");
+var NetworkServiceImpl = class {
+  constructor(networkManager) {
+    this.networkManager = networkManager;
+  }
+  subscribeToNetworkStatus() {
+    return new import_codec_protobuf9.Stream(({ next }) => {
+      const unsubscribe = this.networkManager.connectionStateChanged.on((state) => next({
+        state
+      }));
+      next({
+        state: this.networkManager.connectionState
+      });
+      return unsubscribe;
+    });
+  }
+  async setNetworkOptions(request) {
+    await this.networkManager.setConnectionState(request.state);
+  }
+};
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-var import_node_assert11 = __toESM(require("node:assert"));
-var import_async12 = require("@dxos/async");
+var import_node_assert9 = __toESM(require("node:assert"));
+var import_async11 = require("@dxos/async");
 var import_context7 = require("@dxos/context");
 var import_credentials10 = require("@dxos/credentials");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_keys8 = require("@dxos/keys");
-var import_log9 = require("@dxos/log");
-var import_teleport_extension_presence = require("@dxos/teleport-extension-presence");
+var import_log8 = require("@dxos/log");
+var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-var import_async11 = require("@dxos/async");
+var import_async10 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_debug3 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
@@ -2182,20 +2033,21 @@ var import_credentials9 = require("@dxos/protocols/proto/dxos/halo/credentials")
 var import_util4 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-var import_node_assert10 = __toESM(require("node:assert"));
-var import_async10 = require("@dxos/async");
+var import_node_assert8 = __toESM(require("node:assert"));
+var import_async9 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
 var import_keys6 = require("@dxos/keys");
-var import_log8 = require("@dxos/log");
-var import_protocols5 = require("@dxos/protocols");
+var import_log7 = require("@dxos/log");
+var import_protocols4 = require("@dxos/protocols");
 var import_teleport3 = require("@dxos/teleport");
 var import_util3 = require("@dxos/util");
 var RETRY_TIMEOUT = 1e3;
+var SUCCESS_DELAY = 1e3;
 var NOTARIZE_TIMEOUT = 1e4;
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new import_context5.Context();
-    this._extensionOpened = new import_async10.Event();
+    this._extensionOpened = new import_async9.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util3.ComplexSet(import_keys6.PublicKey.hash);
     this._processCredentialsTriggers = new import_util3.ComplexMap(import_keys6.PublicKey.hash);
@@ -2209,23 +2061,23 @@ var NotarizationPlugin = class {
   * Request credentials to be notarized.
   */
   async notarize(credentials) {
-    (0, import_log8.log)("notarize", {
+    (0, import_log7.log)("notarize", {
       credentials
     }, {
       file: "notarization-plugin.ts",
-      line: 44,
+      line: 50,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    (0, import_node_assert10.default)(credentials.every((credential) => credential.id), "Credentials must have an id");
-    const errors = new import_async10.Trigger();
+    (0, import_node_assert8.default)(credentials.every((credential) => credential.id), "Credentials must have an id");
+    const errors = new import_async9.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        import_log8.log.warn("Notarization error", {
+        import_log7.log.warn("Notarization error", {
           err
         }, {
           file: "notarization-plugin.ts",
-          line: 53,
+          line: 59,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2233,24 +2085,24 @@ var NotarizationPlugin = class {
         errors.throw(err);
       }
     });
-    (0, import_async10.scheduleTask)(ctx, () => {
-      import_log8.log.warn("Notarization timeout", {}, {
+    (0, import_async9.scheduleTask)(ctx, () => {
+      import_log7.log.warn("Notarization timeout", {}, {
         file: "notarization-plugin.ts",
-        line: 61,
+        line: 67,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       void ctx.dispose();
-      errors.throw(new import_async10.TimeoutError(NOTARIZE_TIMEOUT, "Notarization timed out"));
+      errors.throw(new import_async9.TimeoutError(NOTARIZE_TIMEOUT, "Notarization timed out"));
     }, NOTARIZE_TIMEOUT);
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async10.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async9.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
-          import_log8.log.warn("No peers to notarize with", {}, {
+          import_log7.log.warn("No peers to notarize with", {}, {
             file: "notarization-plugin.ts",
-            line: 76,
+            line: 82,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2260,41 +2112,42 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          import_log8.log.warn("Exhausted all peers to notarize with", {
+          import_log7.log.warn("Exhausted all peers to notarize with", {
             retryIn: RETRY_TIMEOUT
           }, {
             file: "notarization-plugin.ts",
-            line: 83,
+            line: 89,
             scope: this,
             callSite: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async10.scheduleTask)(ctx, () => notarizeTask.schedule(), RETRY_TIMEOUT);
+          (0, import_async9.scheduleTask)(ctx, () => notarizeTask.schedule(), RETRY_TIMEOUT);
           return;
         }
         peersTried.add(peer);
-        (0, import_log8.log)("try notarizing", {
+        (0, import_log7.log)("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
           file: "notarization-plugin.ts",
-          line: 90,
+          line: 96,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        (0, import_log8.log)("success", {}, {
+        (0, import_log7.log)("success", {}, {
           file: "notarization-plugin.ts",
-          line: 94,
+          line: 100,
           scope: this,
           callSite: (f, a) => f(...a)
         });
+        await (0, import_async9.sleep)(SUCCESS_DELAY);
       } catch (err) {
-        import_log8.log.warn("error notarizing (recoverable)", err, {
+        import_log7.log.warn("error notarizing (recoverable)", err, {
           file: "notarization-plugin.ts",
-          line: 96,
+          line: 103,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2308,9 +2161,9 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      (0, import_log8.log)("done", {}, {
+      (0, import_log7.log)("done", {}, {
         file: "notarization-plugin.ts",
-        line: 107,
+        line: 114,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2331,14 +2184,14 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    (0, import_node_assert10.default)(!this._writer, "Writer already set.");
+    (0, import_node_assert8.default)(!this._writer, "Writer already set.");
     this._writer = writer;
   }
   async _waitUntilProcessed(id) {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util3.entry)(this._processCredentialsTriggers, id).orInsert(new import_async10.Trigger()).value.wait();
+    await (0, import_util3.entry)(this._processCredentialsTriggers, id).orInsert(new import_async9.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -2349,7 +2202,7 @@ var NotarizationPlugin = class {
       throw new Error("Writer not set");
     }
     for (const credential of (_a = request.credentials) != null ? _a : []) {
-      (0, import_node_assert10.default)(credential.id, "Credential must have an id");
+      (0, import_node_assert8.default)(credential.id, "Credential must have an id");
       if (this._processedCredentials.has(credential.id)) {
         continue;
       }
@@ -2359,11 +2212,11 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        (0, import_log8.log)("extension opened", {
+        (0, import_log7.log)("extension opened", {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
-          line: 156,
+          line: 163,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2371,11 +2224,11 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        (0, import_log8.log)("extension closed", {
+        (0, import_log7.log)("extension closed", {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
-          line: 161,
+          line: 168,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2390,10 +2243,10 @@ var NotarizationTeleportExtension = class extends import_teleport3.RpcExtension
   constructor(_params) {
     super({
       requested: {
-        NotarizationService: import_protocols5.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols4.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       },
       exposed: {
-        NotarizationService: import_protocols5.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols4.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
     });
     this._params = _params;
@@ -2434,6 +2287,7 @@ var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new import_context6.Context();
     this._inner = params.inner;
+    this._gossip = params.gossip;
     this._presence = params.presence;
     this._keyring = params.keyring;
     this._feedStore = params.feedStore;
@@ -2490,6 +2344,12 @@ var DataSpace = class DataSpace2 {
     await this.notarizationPlugin.close();
     await this._presence.destroy();
   }
+  async postMessage(channel, message) {
+    return this._gossip.postMessage(channel, message);
+  }
+  listen(channel, callback) {
+    return this._gossip.listen(channel, callback);
+  }
   async initializeDataPipeline() {
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
       timeout: CONTROL_PIPELINE_READY_TIMEFRAME
@@ -2546,7 +2406,7 @@ __decorate([
   (0, import_debug3.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 DataSpace = __decorate([
-  (0, import_async11.trackLeaks)("open", "close")
+  (0, import_async10.trackLeaks)("open", "close")
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
@@ -2572,7 +2432,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._feedStore = _feedStore;
     this._snapshotStore = _snapshotStore;
     this._ctx = new import_context7.Context();
-    this.updated = new import_async12.Event();
+    this.updated = new import_async11.Event();
     this._spaces = new import_util5.ComplexMap(import_keys8.PublicKey.hash);
   }
   // TODO(burdon): Remove.
@@ -2581,7 +2441,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
   async open() {
     await this._metadataStore.load();
-    (0, import_log9.log)("metadata loaded", {
+    (0, import_log8.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
       file: "data-space-manager.ts",
@@ -2590,7 +2450,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       callSite: (f, a) => f(...a)
     });
     for (const spaceMetadata of this._metadataStore.spaces) {
-      (0, import_log9.log)("load space", {
+      (0, import_log8.log)("load space", {
         spaceMetadata
       }, {
         file: "data-space-manager.ts",
@@ -2601,7 +2461,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       const space = await this._constructSpace(spaceMetadata);
       await space.initializeDataPipeline();
       if (spaceMetadata.dataTimeframe) {
-        (0, import_log9.log)("waiting for latest timeframe", {
+        (0, import_log8.log)("waiting for latest timeframe", {
           spaceMetadata
         }, {
           file: "data-space-manager.ts",
@@ -2636,7 +2496,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       controlFeedKey,
       dataFeedKey
     };
-    (0, import_log9.log)("creating space...", {
+    (0, import_log8.log)("creating space...", {
       spaceKey
     }, {
       file: "data-space-manager.ts",
@@ -2648,7 +2508,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     const credentials = await (0, import_echo_pipeline2.spaceGenesis)(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_node_assert11.default)((0, import_credentials10.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    (0, import_node_assert9.default)((0, import_credentials10.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline();
     this._dataServiceSubscriptions.registerSpace(space.key, space.dataPipelineController.databaseBackend.createDataServiceHost());
@@ -2657,7 +2517,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    (0, import_node_assert11.default)(!this._spaces.has(opts.spaceKey), "Space already exists.");
+    (0, import_node_assert9.default)(!this._spaces.has(opts.spaceKey), "Space already exists.");
     const metadata = {
       key: opts.spaceKey,
       genesisFeedKey: opts.genesisFeedKey
@@ -2670,11 +2530,14 @@ var DataSpaceManager = class DataSpaceManager2 {
     return space;
   }
   async _constructSpace(metadata) {
-    const presence = new import_teleport_extension_presence.Presence({
-      localPeerId: this._signingContext.deviceKey,
-      announceInterval: 1e3,
-      offlineTimeout: 1e4,
-      identityKey: this._signingContext.identityKey
+    const gossip = new import_teleport_extension_gossip.Gossip({
+      localPeerId: this._signingContext.deviceKey
+    });
+    const presence = new import_teleport_extension_gossip.Presence({
+      announceInterval: 500,
+      offlineTimeout: 5e3,
+      identityKey: this._signingContext.identityKey,
+      gossip
     });
     const snapshotManager = new import_echo_pipeline2.SnapshotManager(this._snapshotStore);
     const controlFeed = metadata.controlFeedKey && await this._feedStore.openFeed(metadata.controlFeedKey, {
@@ -2691,7 +2554,7 @@ var DataSpaceManager = class DataSpaceManager2 {
         credentialAuthenticator: (0, import_util5.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onNetworkConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.presence", presence.createExtension({
+        session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.objectsync", snapshotManager.objectSync.createExtension());
@@ -2705,6 +2568,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       modelFactory: this._modelFactory,
       metadataStore: this._metadataStore,
       snapshotManager,
+      gossip,
       presence,
       memberKey: this._signingContext.identityKey,
       keyring: this._keyring,
@@ -2718,327 +2582,28 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
 };
 __decorate2([
-  import_async12.synchronized
+  import_async11.synchronized
 ], DataSpaceManager.prototype, "open", null);
 __decorate2([
-  import_async12.synchronized
+  import_async11.synchronized
 ], DataSpaceManager.prototype, "close", null);
 __decorate2([
-  import_async12.synchronized
+  import_async11.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 __decorate2([
-  import_async12.synchronized
+  import_async11.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = __decorate2([
-  (0, import_async12.trackLeaks)("open", "close")
+  (0, import_async11.trackLeaks)("open", "close")
 ], DataSpaceManager);
 
-// packages/sdk/client-services/src/packlets/services/service-context.ts
-var ServiceContext = class {
-  // prettier-ignore
-  constructor(storage, networkManager, modelFactory) {
-    this.storage = storage;
-    this.networkManager = networkManager;
-    this.modelFactory = modelFactory;
-    this.initialized = new import_async13.Trigger();
-    this.dataServiceSubscriptions = new import_echo_pipeline3.DataServiceSubscriptions();
-    this.metadataStore = new import_echo_pipeline3.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline3.SnapshotStore(storage.createDirectory("snapshots"));
-    this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
-    this.feedStore = new import_feed_store4.FeedStore({
-      factory: new import_feed_store4.FeedFactory({
-        root: storage.createDirectory("feeds"),
-        signer: this.keyring,
-        hypercore: {
-          valueEncoding: import_echo_pipeline3.valueEncoding
-        }
-      })
-    });
-    this.spaceManager = new import_echo_pipeline3.SpaceManager({
-      feedStore: this.feedStore,
-      networkManager: this.networkManager
-    });
-    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
-    this.deviceInvitations = new DeviceInvitationsHandler({
-      networkManager: this.networkManager,
-      getIdentity: () => {
-        var _a;
-        return (_a = this.identityManager.identity) != null ? _a : (0, import_debug4.failUndefined)();
-      },
-      acceptIdentity: this._acceptIdentity.bind(this),
-      keyring: this.keyring
-    });
-  }
-  async open() {
-    (0, import_log10.log)("opening...", {}, {
-      file: "service-context.ts",
-      line: 94,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    await this.networkManager.open();
-    await this.spaceManager.open();
-    await this.identityManager.open();
-    if (this.identityManager.identity) {
-      await this._initialize();
-    }
-    (0, import_log10.log)("opened", {}, {
-      file: "service-context.ts",
-      line: 101,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-  }
-  async close() {
-    var _a, _b;
-    (0, import_log10.log)("closing...", {}, {
-      file: "service-context.ts",
-      line: 105,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    await ((_a = this._deviceSpaceSync) == null ? void 0 : _a.close());
-    await ((_b = this.dataSpaceManager) == null ? void 0 : _b.close());
-    await this.identityManager.close();
-    await this.spaceManager.close();
-    await this.feedStore.close();
-    await this.networkManager.close();
-    this.dataServiceSubscriptions.clear();
-    (0, import_log10.log)("closed", {}, {
-      file: "service-context.ts",
-      line: 113,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-  }
-  async reset() {
-    (0, import_log10.log)("resetting...", {}, {
-      file: "service-context.ts",
-      line: 117,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    await this.close();
-    await this.storage.reset();
-    (0, import_log10.log)("reset", {}, {
-      file: "service-context.ts",
-      line: 120,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-  }
-  async createIdentity(params = {}) {
-    const identity = await this.identityManager.createIdentity(params);
-    await this._initialize();
-    return identity;
-  }
-  async _acceptIdentity(params) {
-    const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize();
-    return identity;
-  }
-  // Called when identity is created.
-  async _initialize() {
-    var _a;
-    (0, import_log10.log)("initializing spaces...", {}, {
-      file: "service-context.ts",
-      line: 139,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug4.failUndefined)();
-    const signingContext = {
-      credentialSigner: identity.getIdentityCredentialSigner(),
-      identityKey: identity.identityKey,
-      deviceKey: identity.deviceKey,
-      profile: identity.profileDocument,
-      recordCredential: async (credential) => {
-        await identity.controlPipeline.writer.write({
-          credential: {
-            credential
-          }
-        });
-      }
-    };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.modelFactory, this.feedStore, this.snapshotStore);
-    await this.dataSpaceManager.open();
-    this.spaceInvitations = new SpaceInvitationsHandler(this.networkManager, this.dataSpaceManager, signingContext, this.keyring);
-    this.initialized.wake();
-    this._deviceSpaceSync = identity.space.spaceState.registerProcessor({
-      process: async (credential) => {
-        const assertion = (0, import_credentials11.getCredentialAssertion)(credential);
-        if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
-          return;
-        }
-        if (assertion.spaceKey.equals(identity.space.key)) {
-          return;
-        }
-        if (!this.dataSpaceManager) {
-          (0, import_log10.log)("dataSpaceManager not initialized yet, ignoring space admission", {
-            details: assertion
-          }, {
-            file: "service-context.ts",
-            line: 182,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          return;
-        }
-        if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log10.log)("space already exists, ignoring space admission", {
-            details: assertion
-          }, {
-            file: "service-context.ts",
-            line: 186,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          return;
-        }
-        try {
-          (0, import_log10.log)("accepting space recorded in halo", {
-            details: assertion
-          }, {
-            file: "service-context.ts",
-            line: 191,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          await this.dataSpaceManager.acceptSpace({
-            spaceKey: assertion.spaceKey,
-            genesisFeedKey: assertion.genesisFeedKey
-          });
-        } catch (err) {
-          import_log10.log.catch(err, {}, {
-            file: "service-context.ts",
-            line: 197,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        }
-      }
-    });
-    await this._deviceSpaceSync.open();
-  }
-};
-
-// packages/sdk/client-services/src/packlets/services/service-definitions.ts
-var import_protocols6 = require("@dxos/protocols");
-var import_rpc = require("@dxos/rpc");
-var clientServiceBundle = (0, import_rpc.createServiceBundle)({
-  SystemService: import_protocols6.schema.getService("dxos.client.services.SystemService"),
-  IdentityService: import_protocols6.schema.getService("dxos.client.services.IdentityService"),
-  DeviceInvitationsService: import_protocols6.schema.getService("dxos.client.services.DeviceInvitationsService"),
-  DevicesService: import_protocols6.schema.getService("dxos.client.services.DevicesService"),
-  SpaceInvitationsService: import_protocols6.schema.getService("dxos.client.services.SpaceInvitationsService"),
-  SpacesService: import_protocols6.schema.getService("dxos.client.services.SpacesService"),
-  DataService: import_protocols6.schema.getService("dxos.echo.service.DataService"),
-  NetworkService: import_protocols6.schema.getService("dxos.client.services.NetworkService"),
-  // TODO(burdon): Deprecated.
-  DevtoolsHost: import_protocols6.schema.getService("dxos.devtools.host.DevtoolsHost"),
-  TracingService: import_protocols6.schema.getService("dxos.devtools.host.TracingService")
-});
-
-// packages/sdk/client-services/src/packlets/services/service-host.ts
-var import_node_assert14 = __toESM(require("node:assert"));
-var import_async22 = require("@dxos/async");
-var import_debug6 = require("@dxos/debug");
-var import_document_model = require("@dxos/document-model");
-var import_echo_pipeline5 = require("@dxos/echo-pipeline");
-var import_log17 = require("@dxos/log");
-var import_model_factory = require("@dxos/model-factory");
-var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
-var import_text_model = require("@dxos/text-model");
-
-// packages/sdk/client-services/src/packlets/deprecated/tracing.ts
-var TracingServiceImpl = class {
-  constructor(_config) {
-    this._config = _config;
-  }
-  async setTracingOptions() {
-    throw new Error("Tracing not available.");
-  }
-  subscribeToRpcTrace() {
-    throw new Error("Tracing not available.");
-  }
-};
-
-// packages/sdk/client-services/src/packlets/devices/devices-service.ts
-var import_async14 = require("@dxos/async");
-var import_codec_protobuf8 = require("@dxos/codec-protobuf");
-var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
-var DevicesServiceImpl = class {
-  constructor(_identityManager) {
-    this._identityManager = _identityManager;
-  }
-  updateDevice(request) {
-    throw new Error("Method not implemented.");
-  }
-  queryDevices() {
-    return new import_codec_protobuf8.Stream(({ next }) => {
-      const update = () => {
-        var _a;
-        const deviceKeys = (_a = this._identityManager.identity) == null ? void 0 : _a.authorizedDeviceKeys;
-        if (!deviceKeys) {
-          next({
-            devices: []
-          });
-        } else {
-          next({
-            devices: Array.from(deviceKeys.values()).map((key) => {
-              var _a2;
-              return {
-                deviceKey: key,
-                kind: ((_a2 = this._identityManager.identity) == null ? void 0 : _a2.deviceKey.equals(key)) ? import_services6.DeviceKind.CURRENT : import_services6.DeviceKind.TRUSTED
-              };
-            })
-          });
-        }
-      };
-      const subscriptions = new import_async14.EventSubscriptions();
-      subscriptions.add(this._identityManager.stateUpdate.on(() => {
-        update();
-        if (this._identityManager.identity) {
-          subscriptions.add(this._identityManager.identity.stateUpdate.on(() => {
-            update();
-          }));
-        }
-      }));
-      update();
-      return () => subscriptions.clear();
-    });
-  }
-};
-
-// packages/sdk/client-services/src/packlets/network/network-service.ts
-var import_codec_protobuf9 = require("@dxos/codec-protobuf");
-var NetworkServiceImpl = class {
-  constructor(networkManager) {
-    this.networkManager = networkManager;
-  }
-  subscribeToNetworkStatus() {
-    return new import_codec_protobuf9.Stream(({ next }) => {
-      const unsubscribe = this.networkManager.connectionStateChanged.on((state) => next({
-        state
-      }));
-      next({
-        state: this.networkManager.connectionState
-      });
-      return unsubscribe;
-    });
-  }
-  async setNetworkOptions(request) {
-    await this.networkManager.setConnectionState(request.state);
-  }
-};
-
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-var import_async15 = require("@dxos/async");
+var import_async12 = require("@dxos/async");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
-var import_debug5 = require("@dxos/debug");
-var import_echo_pipeline4 = require("@dxos/echo-pipeline");
-var import_log11 = require("@dxos/log");
-var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
+var import_debug4 = require("@dxos/debug");
+var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_log9 = require("@dxos/log");
+var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util6 = require("@dxos/util");
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _dataServiceSubscriptions, _getDataSpaceManager) {
@@ -3056,18 +2621,18 @@ var SpacesServiceImpl = class {
     return this._transformSpace(space);
   }
   async updateSpace(request) {
-    (0, import_debug5.todo)();
+    (0, import_debug4.todo)();
   }
   querySpaces() {
     return new import_codec_protobuf10.Stream(({ next, ctx }) => {
       const onUpdate = async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).filter((space) => this._dataServiceSubscriptions.getDataService(space.key)).map((space) => this._transformSpace(space));
-        (0, import_log11.log)("update", {
+        (0, import_log9.log)("update", {
           spaces
         }, {
           file: "spaces-service.ts",
-          line: 59,
+          line: 62,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -3077,7 +2642,7 @@ var SpacesServiceImpl = class {
       };
       setTimeout(async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async15.EventSubscriptions();
+        const subscriptions = new import_async12.EventSubscriptions();
         const subscribeSpaces = () => {
           subscriptions.clear();
           for (const space of dataSpaceManager.spaces.values()) {
@@ -3093,7 +2658,7 @@ var SpacesServiceImpl = class {
           void onUpdate();
         });
         ctx.onDispose(() => subscriptions.clear());
-        (0, import_async15.scheduleTask)(ctx, () => {
+        (0, import_async12.scheduleTask)(ctx, () => {
           subscribeSpaces();
           void onUpdate();
         });
@@ -3105,22 +2670,41 @@ var SpacesServiceImpl = class {
       }
     });
   }
+  async postMessage({ spaceKey, channel, message }) {
+    var _a;
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+    await space.postMessage(getChannelId(channel), message);
+  }
+  subscribeMessages({ spaceKey, channel }) {
+    return new import_codec_protobuf10.Stream(({ ctx, next }) => {
+      (0, import_async12.scheduleTask)(ctx, async () => {
+        var _a;
+        const dataSpaceManager = await this._getDataSpaceManager();
+        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+        const handle = space.listen(getChannelId(channel), (message) => {
+          next(message);
+        });
+        ctx.onDispose(() => handle.unsubscribe());
+      });
+    });
+  }
   queryCredentials({ spaceKey }) {
     return new import_codec_protobuf10.Stream(({ ctx, next }) => {
       var _a;
-      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline4.SpaceNotFoundError(spaceKey));
+      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
       const processor = space.spaceState.registerProcessor({
         process: async (credential) => {
           next(credential);
         }
       });
       ctx.onDispose(() => processor.close());
-      (0, import_async15.scheduleTask)(ctx, () => processor.open());
+      (0, import_async12.scheduleTask)(ctx, () => processor.open());
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
     var _a;
-    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline4.SpaceNotFoundError(spaceKey));
+    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
     for (const credential of credentials != null ? credentials : []) {
       await space.controlPipeline.writer.write({
         credential: {
@@ -3132,7 +2716,7 @@ var SpacesServiceImpl = class {
   _transformSpace(space) {
     return {
       spaceKey: space.key,
-      status: space.isOpen ? import_services7.SpaceStatus.ACTIVE : import_services7.SpaceStatus.INACTIVE,
+      status: space.isOpen ? import_services5.SpaceStatus.ACTIVE : import_services5.SpaceStatus.INACTIVE,
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         var _a, _b, _c;
         return {
@@ -3142,12 +2726,13 @@ var SpacesServiceImpl = class {
               displayName: (_b = (_a = member.assertion.profile) == null ? void 0 : _a.displayName) != null ? _b : (0, import_util6.humanize)(member.key)
             }
           },
-          presence: ((_c = this._identityManager.identity) == null ? void 0 : _c.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services7.SpaceMember.PresenceState.ONLINE : import_services7.SpaceMember.PresenceState.OFFLINE
+          presence: ((_c = this._identityManager.identity) == null ? void 0 : _c.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services5.SpaceMember.PresenceState.ONLINE : import_services5.SpaceMember.PresenceState.OFFLINE
         };
       })
     };
   }
 };
+var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/storage/storage.ts
 var import_errors = require("@dxos/errors");
@@ -3205,7 +2790,8 @@ var SystemServiceImpl = class {
     this._onReset = onReset;
   }
   async getConfig() {
-    return this._config.values;
+    var _a, _b;
+    return (_b = (_a = this._config) == null ? void 0 : _a.values) != null ? _b : {};
   }
   async updateStatus({ status }) {
     await this._onUpdateStatus(status);
@@ -3232,40 +2818,75 @@ var SystemServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-var import_async17 = require("@dxos/async");
-var import_log12 = require("@dxos/log");
+var import_async14 = require("@dxos/async");
+var import_log10 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager3 = require("@dxos/network-manager");
-var import_rpc3 = require("@dxos/rpc");
 var import_util7 = require("@dxos/util");
 
-// packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
-var import_node_assert12 = __toESM(require("node:assert"));
-var import_async16 = require("@dxos/async");
-var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
-var import_rpc2 = require("@dxos/rpc");
-
-// packages/sdk/client-services/src/packlets/vault/services.ts
-var import_protocols7 = require("@dxos/protocols");
-var iframeServiceBundle = {
-  IframeService: import_protocols7.schema.getService("dxos.iframe.IframeService"),
-  BridgeService: import_protocols7.schema.getService("dxos.mesh.bridge.BridgeService")
-};
-var workerServiceBundle = {
-  WorkerService: import_protocols7.schema.getService("dxos.iframe.WorkerService")
-};
-var appServiceBundle = {
-  AppService: import_protocols7.schema.getService("dxos.iframe.AppService")
-};
-var shellServiceBundle = {
-  ShellService: import_protocols7.schema.getService("dxos.iframe.ShellService")
+// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
+var import_codec_protobuf12 = require("@dxos/codec-protobuf");
+var import_debug5 = require("@dxos/debug");
+var import_rpc = require("@dxos/rpc");
+var ClientRpcServer = class {
+  constructor(params) {
+    this._handlerCache = /* @__PURE__ */ new Map();
+    const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
+    this._handleCall = handleCall;
+    this._handleStream = handleStream;
+    this._serviceRegistry = serviceRegistry;
+    this._rpcPeer = new import_rpc.RpcPeer({
+      ...rpcOptions,
+      callHandler: (method, params2) => {
+        const [serviceName, methodName] = (0, import_rpc.parseMethodName)(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
+        if (this._handleCall) {
+          return this._handleCall(methodName, params2, handler);
+        } else {
+          return handler(methodName, params2);
+        }
+      },
+      streamHandler: (method, params2) => {
+        const [serviceName, methodName] = (0, import_rpc.parseMethodName)(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
+        if (this._handleStream) {
+          return import_codec_protobuf12.Stream.unwrapPromise(this._handleStream(methodName, params2, handler));
+        } else {
+          return handler(methodName, params2);
+        }
+      }
+    });
+  }
+  async open() {
+    await this._rpcPeer.open();
+  }
+  async close() {
+    await this._rpcPeer.close();
+  }
+  _getServiceHandler(serviceName) {
+    var _a;
+    if (!this._handlerCache.has(serviceName)) {
+      const [key, descriptor] = (_a = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName)) != null ? _a : (0, import_debug5.raise)(new Error(`Service not available: ${serviceName}`));
+      const service = this._serviceRegistry.services[key];
+      if (!service) {
+        throw new Error(`Service not available: ${serviceName}`);
+      }
+      this._handlerCache.set(serviceName, descriptor.createServer(service));
+    }
+    return this._handlerCache.get(serviceName);
+  }
 };
 
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
+var import_node_assert10 = __toESM(require("node:assert"));
+var import_async13 = require("@dxos/async");
+var import_client3 = require("@dxos/client");
+var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
+var import_rpc2 = require("@dxos/rpc");
 var ShellRuntimeImpl = class {
   constructor(_port) {
     this._port = _port;
-    this.layoutUpdate = new import_async16.Event();
+    this.layoutUpdate = new import_async13.Event();
     this._layout = import_iframe.ShellLayout.DEFAULT;
   }
   get layout() {
@@ -3287,13 +2908,13 @@ var ShellRuntimeImpl = class {
     });
   }
   async setAppContext(context) {
-    (0, import_node_assert12.default)(this._appRpc, "runtime not open");
+    (0, import_node_assert10.default)(this._appRpc, "runtime not open");
     await this._appRpc.rpc.AppService.setContext(context);
   }
   async open() {
     this._appRpc = (0, import_rpc2.createProtoRpcPeer)({
-      requested: appServiceBundle,
-      exposed: shellServiceBundle,
+      requested: import_client3.appServiceBundle,
+      exposed: import_client3.shellServiceBundle,
       handlers: {
         ShellService: {
           setLayout: async (request) => {
@@ -3316,8 +2937,8 @@ var ShellRuntimeImpl = class {
 };
 var MemoryShellRuntime = class {
   constructor({ layout, invitationCode, spaceKey } = {}) {
-    this.layoutUpdate = new import_async16.Event();
-    this.contextUpdate = new import_async16.Event();
+    this.layoutUpdate = new import_async13.Event();
+    this.contextUpdate = new import_async13.Event();
     this._layout = layout != null ? layout : import_iframe.ShellLayout.DEFAULT;
     this._invitationCode = invitationCode;
     this._spaceKey = spaceKey;
@@ -3360,21 +2981,10 @@ var LOCK_KEY = "DXOS_RESOURCE_LOCK";
 var IFrameHostRuntime = class {
   constructor({ configProvider, appPort, shellPort }) {
     this._transportFactory = (0, import_network_manager3.createWebRTCTransportFactory)();
-    this._ready = new import_async17.Trigger();
+    this._ready = new import_async14.Trigger();
     this._configProvider = configProvider;
     this._appPort = appPort;
     this._shellPort = shellPort;
-    this._getService = async (find) => {
-      const error = await this._ready.wait();
-      if (error) {
-        throw error;
-      }
-      const service = await find(this._clientServices.services);
-      if (!service) {
-        throw new Error("Service not found");
-      }
-      return service;
-    };
     if (this._shellPort) {
       this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
     }
@@ -3387,9 +2997,9 @@ var IFrameHostRuntime = class {
   }
   async start() {
     var _a;
-    (0, import_log12.log)("starting...", {}, {
+    (0, import_log10.log)("starting...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 83,
+      line: 67,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3407,21 +3017,30 @@ var IFrameHostRuntime = class {
           transportFactory: this._transportFactory
         })
       });
-      this._clientRpc = (0, import_rpc3.createProtoRpcPeer)({
-        exposed: clientServiceBundle,
-        handlers: {
-          DataService: async () => await this._getService((services) => services.DataService),
-          DeviceInvitationsService: async () => await this._getService((services) => services.DeviceInvitationsService),
-          DevicesService: async () => await this._getService((services) => services.DevicesService),
-          DevtoolsHost: async () => await this._getService((services) => services.DevtoolsHost),
-          NetworkService: async () => await this._getService((services) => services.NetworkService),
-          IdentityService: async () => await this._getService((services) => services.IdentityService),
-          SpaceInvitationsService: async () => await this._getService((services) => services.SpaceInvitationsService),
-          SpacesService: async () => await this._getService((services) => services.SpacesService),
-          SystemService: async () => await this._getService((services) => services.SystemService),
-          TracingService: async () => await this._getService((services) => services.TracingService)
+      const middleware = {
+        handleCall: async (method, params, handler) => {
+          const error = await this._ready.wait({
+            timeout: 3e3
+          });
+          if (error) {
+            throw error;
+          }
+          return handler(method, params);
         },
-        port: this._appPort
+        handleStream: async (method, params, handler) => {
+          const error = await this._ready.wait({
+            timeout: 3e3
+          });
+          if (error) {
+            throw error;
+          }
+          return handler(method, params);
+        }
+      };
+      this._clientRpc = new ClientRpcServer({
+        serviceRegistry: this._clientServices.host.serviceRegistry,
+        port: this._appPort,
+        ...middleware
       });
       await Promise.all([
         this._clientServices.open(),
@@ -3429,17 +3048,17 @@ var IFrameHostRuntime = class {
         (_a = this._shellRuntime) == null ? void 0 : _a.open()
       ]);
       this._ready.wake(void 0);
-      (0, import_log12.log)("started", {}, {
+      (0, import_log10.log)("started", {}, {
         file: "iframe-host-runtime.ts",
-        line: 118,
+        line: 110,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      import_log12.log.catch(err, {}, {
+      import_log10.log.catch(err, {}, {
         file: "iframe-host-runtime.ts",
-        line: 121,
+        line: 113,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3447,30 +3066,31 @@ var IFrameHostRuntime = class {
   }
   async stop() {
     var _a;
-    (0, import_log12.log)("stopping...", {}, {
+    (0, import_log10.log)("stopping...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 126,
+      line: 118,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._clientRpc.close();
     await this._clientServices.close();
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
-    (0, import_log12.log)("stopped", {}, {
+    (0, import_log10.log)("stopped", {}, {
       file: "iframe-host-runtime.ts",
-      line: 130,
+      line: 122,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
 };
 __decorate3([
-  import_log12.logInfo
+  import_log10.logInfo
 ], IFrameHostRuntime.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
+var import_client4 = require("@dxos/client");
 var import_network_manager4 = require("@dxos/network-manager");
-var import_rpc4 = require("@dxos/rpc");
+var import_rpc3 = require("@dxos/rpc");
 var IFrameProxyRuntime = class {
   constructor({ systemPort, workerAppPort, windowAppPort, shellPort }) {
     this._transportService = new import_network_manager4.WebRTCTransportService();
@@ -3478,9 +3098,9 @@ var IFrameProxyRuntime = class {
     this._windowAppPort = windowAppPort;
     this._workerAppPort = workerAppPort;
     this._shellPort = shellPort;
-    this._systemRpc = (0, import_rpc4.createProtoRpcPeer)({
-      requested: workerServiceBundle,
-      exposed: iframeServiceBundle,
+    this._systemRpc = (0, import_rpc3.createProtoRpcPeer)({
+      requested: import_client4.workerServiceBundle,
+      exposed: import_client4.iframeServiceBundle,
       handlers: {
         BridgeService: this._transportService,
         IframeService: {
@@ -3506,82 +3126,19 @@ var IFrameProxyRuntime = class {
     await this._systemRpc.rpc.WorkerService.start({
       origin
     });
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.open());
-  }
-  async close() {
-    var _a;
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
-    await this._systemRpc.rpc.WorkerService.stop();
-    await this._systemRpc.close();
-  }
-};
-
-// packages/sdk/client-services/src/packlets/vault/shell-controller.ts
-var import_async18 = require("@dxos/async");
-var import_log13 = require("@dxos/log");
-var import_iframe2 = require("@dxos/protocols/proto/dxos/iframe");
-var import_rpc5 = require("@dxos/rpc");
-var ShellController = class {
-  constructor(_port) {
-    this._port = _port;
-    this.contextUpdate = new import_async18.Event();
-    this._display = import_iframe2.ShellDisplay.NONE;
-  }
-  get display() {
-    return this._display;
-  }
-  async setLayout(layout, options = {}) {
-    var _a;
-    (0, import_log13.log)("set layout", {
-      layout,
-      ...options
-    }, {
-      file: "shell-controller.ts",
-      line: 27,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    this._display = import_iframe2.ShellDisplay.FULLSCREEN;
-    this.contextUpdate.emit({
-      display: this._display
-    });
-    await ((_a = this._shellRpc) == null ? void 0 : _a.rpc.ShellService.setLayout({
-      layout,
-      ...options
-    }));
-  }
-  async open() {
-    this._shellRpc = (0, import_rpc5.createProtoRpcPeer)({
-      requested: shellServiceBundle,
-      exposed: appServiceBundle,
-      handlers: {
-        AppService: {
-          setContext: async (request) => {
-            (0, import_log13.log)("set context", request, {
-              file: "shell-controller.ts",
-              line: 40,
-              scope: this,
-              callSite: (f, a) => f(...a)
-            });
-            this._display = request.display;
-            this.contextUpdate.emit(request);
-          }
-        }
-      },
-      port: this._port
-    });
-    await this._shellRpc.open();
+    await ((_a = this._shellRuntime) == null ? void 0 : _a.open());
   }
   async close() {
     var _a;
-    await ((_a = this._shellRpc) == null ? void 0 : _a.close());
-    this._shellRpc = void 0;
+    await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
+    await this._systemRpc.rpc.WorkerService.stop();
+    await this._systemRpc.close();
   }
 };
 
 // packages/sdk/client-services/src/packlets/vault/vault-resource-lock.ts
-var import_async19 = require("@dxos/async");
-var import_log14 = require("@dxos/log");
+var import_async15 = require("@dxos/async");
+var import_log11 = require("@dxos/log");
 var Message;
 (function(Message2) {
   Message2["ACQUIRING"] = "acquiring";
@@ -3589,7 +3146,7 @@ var Message;
 var VaultResourceLock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new import_async19.Trigger();
+    this._releaseTrigger = new import_async15.Trigger();
     this._lockKey = lockKey;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -3600,7 +3157,7 @@ var VaultResourceLock = class {
       message: Message.ACQUIRING
     });
     try {
-      await (0, import_async19.asyncTimeout)(this._requestLock(), 3e3);
+      await (0, import_async15.asyncTimeout)(this._requestLock(), 3e3);
     } catch (e) {
       await this._requestLock(true);
     }
@@ -3614,7 +3171,7 @@ var VaultResourceLock = class {
     }
   }
   async _requestLock(steal = false) {
-    (0, import_log14.log)("requesting lock...", {
+    (0, import_log11.log)("requesting lock...", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3622,23 +3179,23 @@ var VaultResourceLock = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const acquired = new import_async19.Trigger();
+    const acquired = new import_async15.Trigger();
     void navigator.locks.request(this._lockKey, {
       steal
     }, async () => {
       var _a, _b;
       await ((_a = this._onAcquire) == null ? void 0 : _a.call(this));
       acquired.wake();
-      this._releaseTrigger = new import_async19.Trigger();
+      this._releaseTrigger = new import_async15.Trigger();
       await this._releaseTrigger.wait();
-      (0, import_log14.log)("releasing lock...", {}, {
+      (0, import_log11.log)("releasing lock...", {}, {
         file: "vault-resource-lock.ts",
         line: 65,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       await ((_b = this._onRelease) == null ? void 0 : _b.call(this));
-      (0, import_log14.log)("released lock", {}, {
+      (0, import_log11.log)("released lock", {}, {
         file: "vault-resource-lock.ts",
         line: 67,
         scope: this,
@@ -3649,7 +3206,7 @@ var VaultResourceLock = class {
       await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
     });
     await acquired.wait();
-    (0, import_log14.log)("recieved lock", {
+    (0, import_log11.log)("recieved lock", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3661,16 +3218,17 @@ var VaultResourceLock = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-var import_async21 = require("@dxos/async");
-var import_log16 = require("@dxos/log");
+var import_async17 = require("@dxos/async");
+var import_log13 = require("@dxos/log");
 var import_messaging2 = require("@dxos/messaging");
 var import_network_manager5 = require("@dxos/network-manager");
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
-var import_node_assert13 = __toESM(require("node:assert"));
-var import_async20 = require("@dxos/async");
-var import_log15 = require("@dxos/log");
-var import_rpc6 = require("@dxos/rpc");
+var import_node_assert11 = __toESM(require("node:assert"));
+var import_async16 = require("@dxos/async");
+var import_client5 = require("@dxos/client");
+var import_log12 = require("@dxos/log");
+var import_rpc4 = require("@dxos/rpc");
 var import_util8 = require("@dxos/util");
 var __decorate4 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -3683,40 +3241,48 @@ var __decorate4 = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var WorkerSession = class {
-  constructor({ getService, systemPort, appPort, shellPort, options = {
+  constructor({ serviceHost, systemPort, appPort, shellPort, readySignal, options = {
     heartbeatInterval: 1e3
   } }) {
-    this._startTrigger = new import_async20.Trigger();
+    this._startTrigger = new import_async16.Trigger();
     this.onClose = new import_util8.Callback();
-    (0, import_node_assert13.default)(options);
-    (0, import_node_assert13.default)(getService);
+    (0, import_node_assert11.default)(options);
+    (0, import_node_assert11.default)(serviceHost);
     this._options = options;
-    this._getService = getService;
-    const handlers = {
-      DataService: () => this._getService((services) => services.DataService),
-      DeviceInvitationsService: () => this._getService((services) => services.DeviceInvitationsService),
-      DevicesService: () => this._getService((services) => services.DevicesService),
-      DevtoolsHost: () => this._getService((services) => services.DevtoolsHost),
-      NetworkService: () => this._getService((services) => services.NetworkService),
-      IdentityService: () => this._getService((services) => services.IdentityService),
-      SpaceInvitationsService: () => this._getService((services) => services.SpaceInvitationsService),
-      SpacesService: () => this._getService((services) => services.SpacesService),
-      SystemService: () => this._getService((services) => services.SystemService),
-      TracingService: () => this._getService((services) => services.TracingService)
+    this._serviceHost = serviceHost;
+    const middleware = {
+      handleCall: async (method, params, handler) => {
+        const error = await readySignal.wait({
+          timeout: 3e3
+        });
+        if (error) {
+          throw error;
+        }
+        return handler(method, params);
+      },
+      handleStream: async (method, params, handler) => {
+        const error = await readySignal.wait({
+          timeout: 3e3
+        });
+        if (error) {
+          throw error;
+        }
+        return handler(method, params);
+      }
     };
-    this._clientRpc = (0, import_rpc6.createProtoRpcPeer)({
-      exposed: clientServiceBundle,
-      handlers,
-      port: appPort
-    });
-    this._shellClientRpc = (0, import_rpc6.createProtoRpcPeer)({
-      exposed: clientServiceBundle,
-      handlers,
-      port: shellPort
-    });
-    this._iframeRpc = (0, import_rpc6.createProtoRpcPeer)({
-      requested: iframeServiceBundle,
-      exposed: workerServiceBundle,
+    this._clientRpc = new ClientRpcServer({
+      serviceRegistry: this._serviceHost.serviceRegistry,
+      port: appPort,
+      ...middleware
+    });
+    this._shellClientRpc = new ClientRpcServer({
+      serviceRegistry: this._serviceHost.serviceRegistry,
+      port: shellPort,
+      ...middleware
+    });
+    this._iframeRpc = (0, import_rpc4.createProtoRpcPeer)({
+      requested: import_client5.iframeServiceBundle,
+      exposed: import_client5.workerServiceBundle,
       handlers: {
         WorkerService: {
           start: async (request) => {
@@ -3728,9 +3294,9 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                import_log15.log.catch(err, {}, {
+                import_log12.log.catch(err, {}, {
                   file: "worker-session.ts",
-                  line: 91,
+                  line: 107,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -3746,9 +3312,9 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    import_log15.log.info("opening..", {}, {
+    import_log12.log.info("opening..", {}, {
       file: "worker-session.ts",
-      line: 105,
+      line: 121,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3764,20 +3330,20 @@ var WorkerSession = class {
       try {
         await this._iframeRpc.rpc.IframeService.heartbeat();
       } catch (err1) {
-        import_log15.log.warn("Heartbeat failed", {
+        import_log12.log.warn("Heartbeat failed", {
           err: err1
         }, {
           file: "worker-session.ts",
-          line: 117,
+          line: 133,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         try {
           await this.close();
         } catch (err) {
-          import_log15.log.catch(err, {}, {
+          import_log12.log.catch(err, {}, {
             file: "worker-session.ts",
-            line: 121,
+            line: 137,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3786,18 +3352,18 @@ var WorkerSession = class {
     }, this._options.heartbeatInterval);
   }
   async close() {
-    import_log15.log.info("closing..", {}, {
+    import_log12.log.info("closing..", {}, {
       file: "worker-session.ts",
-      line: 128,
+      line: 144,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      import_log15.log.catch(err, {}, {
+      import_log12.log.catch(err, {}, {
         file: "worker-session.ts",
-        line: 132,
+        line: 148,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3812,11 +3378,11 @@ var WorkerSession = class {
   }
   async _maybeOpenShell() {
     try {
-      await (0, import_async20.asyncTimeout)(this._shellClientRpc.open(), 1e3);
+      await (0, import_async16.asyncTimeout)(this._shellClientRpc.open(), 1e3);
     } catch (e) {
-      import_log15.log.info("No shell connected.", {}, {
+      import_log12.log.info("No shell connected.", {}, {
         file: "worker-session.ts",
-        line: 146,
+        line: 162,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3824,7 +3390,7 @@ var WorkerSession = class {
   }
 };
 __decorate4([
-  import_log15.logInfo
+  import_log12.logInfo
 ], WorkerSession.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
@@ -3833,20 +3399,21 @@ var WorkerRuntime = class {
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new import_network_manager5.WebRTCTransportProxyFactory();
-    this._ready = new import_async21.Trigger();
+    this._ready = new import_async17.Trigger();
     this.sessions = /* @__PURE__ */ new Set();
+    this._clientServices = new ClientServicesHost();
   }
   async start() {
-    (0, import_log16.log)("starting...", {}, {
+    (0, import_log13.log)("starting...", {}, {
       file: "worker-runtime.ts",
-      line: 42,
+      line: 44,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     try {
       this._config = await this._configProvider();
       const signalServer = this._config.get("runtime.services.signal.server");
-      this._clientServices = new ClientServicesHost({
+      this._clientServices.initialize({
         config: this._config,
         networkManager: new import_network_manager5.NetworkManager({
           log: true,
@@ -3858,17 +3425,17 @@ var WorkerRuntime = class {
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
-      (0, import_log16.log)("started", {}, {
+      (0, import_log13.log)("started", {}, {
         file: "worker-runtime.ts",
-        line: 59,
+        line: 61,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      import_log16.log.catch(err, {}, {
+      import_log13.log.catch(err, {}, {
         file: "worker-runtime.ts",
-        line: 62,
+        line: 64,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3882,17 +3449,7 @@ var WorkerRuntime = class {
   */
   async createSession({ appPort, systemPort, shellPort }) {
     const session = new WorkerSession({
-      getService: async (find) => {
-        const error = await this._ready.wait();
-        if (error) {
-          throw error;
-        }
-        const service = find(this._clientServices.services);
-        if (!service) {
-          throw new Error("Service not found");
-        }
-        return service;
-      },
+      serviceHost: this._clientServices,
       appPort,
       systemPort,
       shellPort,
@@ -3927,10 +3484,206 @@ var WorkerRuntime = class {
   }
 };
 
+// packages/sdk/client-services/src/packlets/services/service-context.ts
+var import_async18 = require("@dxos/async");
+var import_credentials11 = require("@dxos/credentials");
+var import_debug6 = require("@dxos/debug");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_feed_store4 = require("@dxos/feed-store");
+var import_keyring = require("@dxos/keyring");
+var import_log14 = require("@dxos/log");
+var ServiceContext = class {
+  // prettier-ignore
+  constructor(storage, networkManager, modelFactory) {
+    this.storage = storage;
+    this.networkManager = networkManager;
+    this.modelFactory = modelFactory;
+    this.initialized = new import_async18.Trigger();
+    this.dataServiceSubscriptions = new import_echo_pipeline4.DataServiceSubscriptions();
+    this.metadataStore = new import_echo_pipeline4.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline4.SnapshotStore(storage.createDirectory("snapshots"));
+    this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
+    this.feedStore = new import_feed_store4.FeedStore({
+      factory: new import_feed_store4.FeedFactory({
+        root: storage.createDirectory("feeds"),
+        signer: this.keyring,
+        hypercore: {
+          valueEncoding: import_echo_pipeline4.valueEncoding
+        }
+      })
+    });
+    this.spaceManager = new import_echo_pipeline4.SpaceManager({
+      feedStore: this.feedStore,
+      networkManager: this.networkManager
+    });
+    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
+    this.deviceInvitations = new DeviceInvitationsHandler({
+      networkManager: this.networkManager,
+      getIdentity: () => {
+        var _a;
+        return (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
+      },
+      acceptIdentity: this._acceptIdentity.bind(this),
+      keyring: this.keyring
+    });
+  }
+  async open() {
+    (0, import_log14.log)("opening...", {}, {
+      file: "service-context.ts",
+      line: 94,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    await this.networkManager.open();
+    await this.spaceManager.open();
+    await this.identityManager.open();
+    if (this.identityManager.identity) {
+      await this._initialize();
+    }
+    (0, import_log14.log)("opened", {}, {
+      file: "service-context.ts",
+      line: 101,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+  }
+  async close() {
+    var _a, _b;
+    (0, import_log14.log)("closing...", {}, {
+      file: "service-context.ts",
+      line: 105,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    await ((_a = this._deviceSpaceSync) == null ? void 0 : _a.close());
+    await ((_b = this.dataSpaceManager) == null ? void 0 : _b.close());
+    await this.identityManager.close();
+    await this.spaceManager.close();
+    await this.feedStore.close();
+    await this.networkManager.close();
+    this.dataServiceSubscriptions.clear();
+    (0, import_log14.log)("closed", {}, {
+      file: "service-context.ts",
+      line: 113,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+  }
+  async reset() {
+    (0, import_log14.log)("resetting...", {}, {
+      file: "service-context.ts",
+      line: 117,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    await this.close();
+    await this.storage.reset();
+    (0, import_log14.log)("reset", {}, {
+      file: "service-context.ts",
+      line: 120,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+  }
+  async createIdentity(params = {}) {
+    const identity = await this.identityManager.createIdentity(params);
+    await this._initialize();
+    return identity;
+  }
+  async _acceptIdentity(params) {
+    const identity = await this.identityManager.acceptIdentity(params);
+    await this._initialize();
+    return identity;
+  }
+  // Called when identity is created.
+  async _initialize() {
+    var _a;
+    (0, import_log14.log)("initializing spaces...", {}, {
+      file: "service-context.ts",
+      line: 139,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
+    const signingContext = {
+      credentialSigner: identity.getIdentityCredentialSigner(),
+      identityKey: identity.identityKey,
+      deviceKey: identity.deviceKey,
+      profile: identity.profileDocument,
+      recordCredential: async (credential) => {
+        await identity.controlPipeline.writer.write({
+          credential: {
+            credential
+          }
+        });
+      }
+    };
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.modelFactory, this.feedStore, this.snapshotStore);
+    await this.dataSpaceManager.open();
+    this.spaceInvitations = new SpaceInvitationsHandler(this.networkManager, this.dataSpaceManager, signingContext, this.keyring);
+    this.initialized.wake();
+    this._deviceSpaceSync = identity.space.spaceState.registerProcessor({
+      process: async (credential) => {
+        const assertion = (0, import_credentials11.getCredentialAssertion)(credential);
+        if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
+          return;
+        }
+        if (assertion.spaceKey.equals(identity.space.key)) {
+          return;
+        }
+        if (!this.dataSpaceManager) {
+          (0, import_log14.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+            details: assertion
+          }, {
+            file: "service-context.ts",
+            line: 182,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          return;
+        }
+        if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
+          (0, import_log14.log)("space already exists, ignoring space admission", {
+            details: assertion
+          }, {
+            file: "service-context.ts",
+            line: 186,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          return;
+        }
+        try {
+          (0, import_log14.log)("accepting space recorded in halo", {
+            details: assertion
+          }, {
+            file: "service-context.ts",
+            line: 191,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          await this.dataSpaceManager.acceptSpace({
+            spaceKey: assertion.spaceKey,
+            genesisFeedKey: assertion.genesisFeedKey
+          });
+        } catch (err) {
+          import_log14.log.catch(err, {}, {
+            file: "service-context.ts",
+            line: 197,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+        }
+      }
+    });
+    await this._deviceSpaceSync.open();
+  }
+};
+
 // packages/sdk/client-services/src/packlets/services/service-registry.ts
 var ServiceRegistry = class {
   // prettier-ignore
-  constructor(_serviceBundle, _handlers) {
+  constructor(_serviceBundle, _handlers = {}) {
     this._serviceBundle = _serviceBundle;
     this._handlers = _handlers;
   }
@@ -3943,28 +3696,35 @@ var ServiceRegistry = class {
   setServices(services) {
     this._handlers = services;
   }
+  addService(name, service) {
+    this._handlers[name] = service;
+  }
+  removeService(name) {
+    delete this._handlers[name];
+  }
 };
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-var createDefaultModelFactory = () => {
-  return new import_model_factory.ModelFactory().registerModel(import_document_model.DocumentModel).registerModel(import_text_model.TextModel);
-};
 var ClientServicesHost = class {
   constructor({
     config,
-    modelFactory = createDefaultModelFactory(),
+    modelFactory = (0, import_client6.createDefaultModelFactory)(),
     // TODO(burdon): Create ApolloLink abstraction (see Client).
     networkManager,
-    storage = createStorageObjects(config.get("runtime.client.storage", {})).storage,
+    storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey
-  }) {
-    this._statusUpdate = new import_async22.Event();
+  } = {}) {
+    this._statusUpdate = new import_async19.Event();
     this._open = false;
-    this._config = config;
-    this._modelFactory = modelFactory;
-    this._networkManager = networkManager;
     this._storage = storage;
+    this._modelFactory = modelFactory;
+    if (config) {
+      this.initialize({
+        config,
+        networkManager
+      });
+    }
     this._resourceLock = lockKey ? new VaultResourceLock({
       lockKey,
       onAcquire: () => this.open(),
@@ -3973,41 +3733,66 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services15.SystemStatus.ACTIVE : import_services15.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services8.SystemStatus.ACTIVE : import_services8.SystemStatus.INACTIVE,
       onUpdateStatus: async (status) => {
         var _a, _b;
-        if (!this.isOpen && status === import_services15.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services8.SystemStatus.ACTIVE) {
           await ((_a = this._resourceLock) == null ? void 0 : _a.acquire());
-        } else if (this.isOpen && status === import_services15.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services8.SystemStatus.INACTIVE) {
           await ((_b = this._resourceLock) == null ? void 0 : _b.release());
         }
       },
       onReset: async () => {
-        (0, import_node_assert14.default)(this._serviceContext, "service host is closed");
+        (0, import_node_assert12.default)(this._serviceContext, "service host is closed");
         await this._serviceContext.reset();
       }
     });
-    this._serviceRegistry = new ServiceRegistry(clientServiceBundle, {
+    this._serviceRegistry = new ServiceRegistry(import_client6.clientServiceBundle, {
       SystemService: this._systemService
     });
   }
   get isOpen() {
     return this._open;
   }
+  get serviceRegistry() {
+    return this._serviceRegistry;
+  }
   get descriptors() {
     return this._serviceRegistry.descriptors;
   }
   get services() {
     return this._serviceRegistry.services;
   }
+  /**
+  * Initialize the service host with the config.
+  * Config can also be provided in the constructor.
+  * Can only be called once.
+  */
+  initialize({ config, networkManager }) {
+    (0, import_node_assert12.default)(!this._open, "service host is open");
+    if (config) {
+      (0, import_node_assert12.default)(!this._config, "config already set");
+      this._config = config;
+      if (!this._storage) {
+        this._storage = createStorageObjects(config.get("runtime.client.storage", {})).storage;
+      }
+    }
+    if (networkManager) {
+      (0, import_node_assert12.default)(!this._networkManager, "network manager already set");
+      this._networkManager = networkManager;
+    }
+  }
   async open() {
     var _a, _b;
     if (this._open) {
       return;
     }
-    (0, import_log17.log)("opening...", {}, {
+    (0, import_node_assert12.default)(this._config, "config not set");
+    (0, import_node_assert12.default)(this._storage, "storage not set");
+    (0, import_node_assert12.default)(this._networkManager, "network manager not set");
+    (0, import_log15.log)("opening...", {}, {
       file: "service-host.ts",
-      line: 133,
+      line: 166,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4020,10 +3805,10 @@ var ClientServicesHost = class {
       DeviceInvitationsService: new DeviceInvitationsServiceImpl(this._serviceContext.identityManager, this._serviceContext.deviceInvitations),
       SpaceInvitationsService: new SpaceInvitationsServiceImpl(this._serviceContext.identityManager, () => {
         var _a2;
-        return (_a2 = this._serviceContext.spaceInvitations) != null ? _a2 : (0, import_debug6.raise)(new Error("SpaceInvitations not initialized"));
+        return (_a2 = this._serviceContext.spaceInvitations) != null ? _a2 : (0, import_debug7.raise)(new Error("SpaceInvitations not initialized"));
       }, () => {
         var _a2;
-        return (_a2 = this._serviceContext.dataSpaceManager) != null ? _a2 : (0, import_debug6.raise)(new Error("SpaceManager not initialized"));
+        return (_a2 = this._serviceContext.dataSpaceManager) != null ? _a2 : (0, import_debug7.raise)(new Error("SpaceManager not initialized"));
       }),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, this._serviceContext.dataServiceSubscriptions, async () => {
         await this._serviceContext.initialized.wait();
@@ -4043,11 +3828,11 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = (_b = this._serviceContext.identityManager.identity) == null ? void 0 : _b.deviceKey;
-    (0, import_log17.log)("opened", {
+    (0, import_log15.log)("opened", {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 186,
+      line: 219,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4058,11 +3843,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    (0, import_log17.log)("closing...", {
+    (0, import_log15.log)("closing...", {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 195,
+      line: 228,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4072,49 +3857,17 @@ var ClientServicesHost = class {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log17.log)("closed", {
+    (0, import_log15.log)("closed", {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 200,
+      line: 233,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
 };
 
-// packages/sdk/client-services/src/packlets/services/service-proxy.ts
-var import_async23 = require("@dxos/async");
-var import_errors2 = require("@dxos/errors");
-var import_rpc7 = require("@dxos/rpc");
-var ClientServicesProxy = class {
-  // prettier-ignore
-  constructor(port, _timeout = 3e4) {
-    this._timeout = _timeout;
-    this._proxy = (0, import_rpc7.createProtoRpcPeer)({
-      requested: clientServiceBundle,
-      exposed: {},
-      handlers: {},
-      port
-    });
-  }
-  get proxy() {
-    return this._proxy;
-  }
-  get descriptors() {
-    return clientServiceBundle;
-  }
-  get services() {
-    return this._proxy.rpc;
-  }
-  async open() {
-    await (0, import_async23.asyncTimeout)(this._proxy.open(), this._timeout, new import_errors2.RemoteServiceConnectionTimeout());
-  }
-  async close() {
-    await this._proxy.close();
-  }
-};
-
 // packages/sdk/client-services/src/packlets/services/local-client-services.ts
 var LocalClientServices = class {
   constructor(params) {
@@ -4126,6 +3879,9 @@ var LocalClientServices = class {
   get services() {
     return this._host.services;
   }
+  get host() {
+    return this._host;
+  }
   async open() {
     await this._host.open();
   }
@@ -4133,58 +3889,77 @@ var LocalClientServices = class {
     await this._host.close();
   }
 };
+
+// packages/sdk/client-services/src/packlets/services/utils.ts
+var import_config2 = require("@dxos/config");
+var import_log16 = require("@dxos/log");
+var import_messaging3 = require("@dxos/messaging");
+var import_network_manager6 = require("@dxos/network-manager");
+var fromHost = (config = new import_config2.Config()) => {
+  return new LocalClientServices({
+    config,
+    networkManager: createNetworkManager(config)
+  });
+};
+var createNetworkManager = (config, options = {}) => {
+  const signalServer = config.get("runtime.services.signal.server");
+  if (signalServer) {
+    const { log: log1 = true, signalManager = new import_messaging3.WebsocketSignalManager([
+      signalServer
+    ]), transportFactory = (0, import_network_manager6.createWebRTCTransportFactory)({
+      iceServers: config.get("runtime.services.ice")
+    }) } = options;
+    return new import_network_manager6.NetworkManager({
+      log: log1,
+      signalManager,
+      transportFactory
+    });
+  }
+  import_log16.log.warn("P2P network is not configured.", {}, {
+    file: "utils.ts",
+    line: 48,
+    scope: void 0,
+    callSite: (f, a) => f(...a)
+  });
+  return new import_network_manager6.NetworkManager({
+    signalManager: new import_messaging3.MemorySignalManager(new import_messaging3.MemorySignalManagerContext()),
+    transportFactory: import_network_manager6.MemoryTransportFactory
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  AUTHENTICATION_CODE_LENGTH,
-  AbstractInvitationsHandler,
-  AbstractInvitationsProxy,
   AbstractInvitationsService,
-  AuthenticatingInvitationProvider,
   ClientServicesHost,
-  ClientServicesProxy,
   DeviceInvitationsHandler,
-  DeviceInvitationsProxy,
   DeviceInvitationsServiceImpl,
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
   IFrameHostRuntime,
   IFrameProxyRuntime,
-  INVITATION_TIMEOUT,
   Identity,
   IdentityManager,
   IdentityServiceImpl,
-  InvitationEncoder,
-  InvitationObservableProvider,
   LocalClientServices,
   MemoryShellRuntime,
-  ON_CLOSE_DELAY,
   ServiceContext,
   ServiceRegistry,
-  ShellController,
   ShellRuntimeImpl,
   SpaceInvitationsHandler,
-  SpaceInvitationsProxy,
   SpaceInvitationsServiceImpl,
   TrustedKeySetAuthVerifier,
   VaultResourceLock,
   WorkerRuntime,
   WorkerSession,
-  appServiceBundle,
-  clientServiceBundle,
   createAuthProvider,
-  createDefaultModelFactory,
   createStorageObjects,
+  fromHost,
   getNetworkPeers,
-  iframeServiceBundle,
-  shellServiceBundle,
   subscribeToFeedBlocks,
   subscribeToFeeds,
   subscribeToNetworkStatus,
   subscribeToNetworkTopics,
   subscribeToSignal,
   subscribeToSpaces,
-  subscribeToSwarmInfo,
-  workerServiceBundle,
-  wrapObservable
+  subscribeToSwarmInfo
 });
 //# sourceMappingURL=index.cjs.map