@dxos/client-services 0.1.39 → 0.1.40

package/dist/lib/browser/{chunk-2DGNNQWS.mjs → chunk-LGMYP2WL.mjs}

@@ -928,18 +928,236 @@ var DeviceInvitationProtocol = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
-import assert5 from "@dxos/node-std/assert";
-import { PushStream, scheduleTask, sleep, TimeoutError, Trigger as Trigger2 } from "@dxos/async";
-import { AUTHENTICATION_CODE_LENGTH, CancellableInvitationObservable, INVITATION_TIMEOUT, ON_CLOSE_DELAY, AuthenticatingInvitationObservable } from "@dxos/client";
-import { Context as Context3 } from "@dxos/context";
+import assert6 from "@dxos/node-std/assert";
+import { PushStream, scheduleTask, sleep, TimeoutError, Trigger as Trigger3 } from "@dxos/async";
+import { AuthenticatingInvitationObservable, AUTHENTICATION_CODE_LENGTH, CancellableInvitationObservable, INVITATION_TIMEOUT, ON_CLOSE_DELAY } from "@dxos/client";
+import { Context as Context4 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
-import { PublicKey as PublicKey4 } from "@dxos/keys";
-import { log as log4 } from "@dxos/log";
+import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2 } from "@dxos/errors";
+import { PublicKey as PublicKey5 } from "@dxos/keys";
+import { log as log5 } from "@dxos/log";
 import { createTeleportProtocolFactory, StarTopology } from "@dxos/network-manager";
-import { schema as schema2, trace as trace2 } from "@dxos/protocols";
+import { trace as trace3 } from "@dxos/protocols";
 import { Invitation as Invitation2 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse } from "@dxos/protocols/proto/dxos/halo/invitations";
+
+// packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts
+import assert5 from "@dxos/node-std/assert";
+import { Trigger as Trigger2 } from "@dxos/async";
+import { cancelWithContext, Context as Context3 } from "@dxos/context";
+import { InvalidInvitationExtensionRoleError } from "@dxos/errors";
+import { PublicKey as PublicKey4 } from "@dxos/keys";
+import { log as log4 } from "@dxos/log";
+import { schema as schema2, trace as trace2 } from "@dxos/protocols";
+import { Options } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension } from "@dxos/teleport";
+var OPTIONS_TIMEOUT = 1e4;
+var InvitationHostExtension = class extends RpcExtension {
+  constructor(_callbacks) {
+    super({
+      requested: {
+        InvitationHostService: schema2.getService("dxos.halo.invitations.InvitationHostService")
+      },
+      exposed: {
+        InvitationHostService: schema2.getService("dxos.halo.invitations.InvitationHostService")
+      }
+    });
+    this._callbacks = _callbacks;
+    this._ctx = new Context3();
+    this._remoteOptionsTrigger = new Trigger2();
+  }
+  async getHandlers() {
+    return {
+      // TODO(dmaretskyi): For now this is just forwarding the data to callbacks since we don't have session-specific logic.
+      // Perhaps in the future we will have more complex logic here.
+      InvitationHostService: {
+        options: async (options) => {
+          assert5(!this._remoteOptions, "Remote options already set.");
+          this._remoteOptions = options;
+          this._remoteOptionsTrigger.wake();
+        },
+        introduce: async (request) => {
+          const traceId = PublicKey4.random().toHex();
+          log4.trace("dxos.sdk.invitation-handler.host.introduce", trace2.begin({
+            id: traceId,
+            parentId: this._traceParent
+          }), {
+            file: "invitation-extension.ts",
+            line: 78,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          const response = await this._callbacks.introduce(request);
+          log4.trace("dxos.sdk.invitation-handler.host.introduce", trace2.end({
+            id: traceId
+          }), {
+            file: "invitation-extension.ts",
+            line: 83,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          return response;
+        },
+        authenticate: async (request) => {
+          const traceId = PublicKey4.random().toHex();
+          log4.trace("dxos.sdk.invitation-handler.host.authenticate", trace2.begin({
+            id: traceId,
+            parentId: this._traceParent
+          }), {
+            file: "invitation-extension.ts",
+            line: 89,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          const response = await this._callbacks.authenticate(request);
+          log4.trace("dxos.sdk.invitation-handler.host.authenticate", trace2.end({
+            id: traceId,
+            data: {
+              ...response
+            }
+          }), {
+            file: "invitation-extension.ts",
+            line: 94,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          return response;
+        },
+        admit: async (request) => {
+          const traceId = PublicKey4.random().toHex();
+          log4.trace("dxos.sdk.invitation-handler.host.admit", trace2.begin({
+            id: traceId,
+            parentId: this._traceParent
+          }), {
+            file: "invitation-extension.ts",
+            line: 100,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          const response = await this._callbacks.admit(request);
+          log4.trace("dxos.sdk.invitation-handler.host.admit", trace2.end({
+            id: traceId
+          }), {
+            file: "invitation-extension.ts",
+            line: 105,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          return response;
+        }
+      }
+    };
+  }
+  async onOpen(context) {
+    var _a;
+    await super.onOpen(context);
+    try {
+      await this.rpc.InvitationHostService.options({
+        role: Options.Role.HOST
+      });
+      await cancelWithContext(this._ctx, this._remoteOptionsTrigger.wait({
+        timeout: OPTIONS_TIMEOUT
+      }));
+      if (((_a = this._remoteOptions) == null ? void 0 : _a.role) !== Options.Role.GUEST) {
+        throw new InvalidInvitationExtensionRoleError(void 0, {
+          expected: Options.Role.GUEST,
+          remoteOptions: this._remoteOptions
+        });
+      }
+      this._callbacks.onOpen();
+    } catch (err) {
+      this._callbacks.onError(err);
+    }
+  }
+  async onClose() {
+    await this._ctx.dispose();
+  }
+};
+var InvitationGuestExtension = class extends RpcExtension {
+  constructor(_callbacks) {
+    super({
+      requested: {
+        InvitationHostService: schema2.getService("dxos.halo.invitations.InvitationHostService")
+      },
+      exposed: {
+        InvitationHostService: schema2.getService("dxos.halo.invitations.InvitationHostService")
+      }
+    });
+    this._callbacks = _callbacks;
+    this._ctx = new Context3();
+    this._remoteOptionsTrigger = new Trigger2();
+  }
+  async getHandlers() {
+    return {
+      InvitationHostService: {
+        options: async (options) => {
+          assert5(!this._remoteOptions, "Remote options already set.");
+          this._remoteOptions = options;
+          this._remoteOptionsTrigger.wake();
+        },
+        introduce: () => {
+          throw new Error("Method not allowed.");
+        },
+        authenticate: () => {
+          throw new Error("Method not allowed.");
+        },
+        admit: () => {
+          throw new Error("Method not allowed.");
+        }
+      }
+    };
+  }
+  async onOpen(context) {
+    var _a;
+    await super.onOpen(context);
+    try {
+      log4("begin options", {}, {
+        file: "invitation-extension.ts",
+        line: 189,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      await cancelWithContext(this._ctx, this.rpc.InvitationHostService.options({
+        role: Options.Role.GUEST
+      }));
+      await cancelWithContext(this._ctx, this._remoteOptionsTrigger.wait({
+        timeout: OPTIONS_TIMEOUT
+      }));
+      log4("end options", {}, {
+        file: "invitation-extension.ts",
+        line: 192,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      if (((_a = this._remoteOptions) == null ? void 0 : _a.role) !== Options.Role.HOST) {
+        throw new InvalidInvitationExtensionRoleError(void 0, {
+          expected: Options.Role.HOST,
+          remoteOptions: this._remoteOptions
+        });
+      }
+      this._callbacks.onOpen(this._ctx);
+    } catch (err) {
+      log4("openError", err, {
+        file: "invitation-extension.ts",
+        line: 202,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      this._callbacks.onError(err);
+    }
+  }
+  async onClose() {
+    log4("onClose", {}, {
+      file: "invitation-extension.ts",
+      line: 208,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    await this._ctx.dispose();
+  }
+};
+
+// packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationsHandler = class {
   constructor(_networkManager) {
@@ -947,9 +1165,9 @@ var InvitationsHandler = class {
   }
   createInvitation(protocol, options) {
     var _a;
-    const { invitationId = PublicKey4.random().toHex(), type = Invitation2.Type.INTERACTIVE, authMethod = Invitation2.AuthMethod.SHARED_SECRET, state = Invitation2.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey4.random() } = options != null ? options : {};
+    const { invitationId = PublicKey5.random().toHex(), type = Invitation2.Type.INTERACTIVE, authMethod = Invitation2.AuthMethod.SHARED_SECRET, state = Invitation2.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey5.random() } = options != null ? options : {};
     const authCode = (_a = options == null ? void 0 : options.authCode) != null ? _a : authMethod === Invitation2.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0;
-    assert5(protocol);
+    assert6(protocol);
     const invitation = {
       invitationId,
       type,
@@ -961,36 +1179,36 @@ var InvitationsHandler = class {
       ...protocol.getInvitationContext()
     };
     const stream = new PushStream();
-    const ctx = new Context3({
+    const ctx = new Context4({
       onError: (err) => {
         void ctx.dispose();
         stream.error(err);
       }
     });
     ctx.onDispose(() => {
-      log4("complete", {
+      log5("complete", {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 106,
+        line: 99,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       stream.complete();
     });
     const createExtension = () => {
-      const success = new Trigger2();
+      const success = new Trigger3();
       let guestProfile;
       let authenticationPassed = false;
       let authenticationRetry = 0;
       const extension = new InvitationHostExtension({
         introduce: async ({ profile }) => {
-          log4("guest introduced itself", {
+          log5("guest introduced itself", {
             guestProfile: profile,
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 119,
+            line: 112,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1005,20 +1223,20 @@ var InvitationsHandler = class {
           };
         },
         authenticate: async ({ authCode: code }) => {
-          log4("received authentication request", {
+          log5("received authentication request", {
             authCode: code
           }, {
             file: "invitations-handler.ts",
-            line: 138,
+            line: 131,
             scope: this,
             callSite: (f, a) => f(...a)
           });
           let status = AuthenticationResponse.Status.OK;
           switch (invitation.authMethod) {
             case Invitation2.AuthMethod.NONE: {
-              log4("authentication not required", {}, {
+              log5("authentication not required", {}, {
                 file: "invitations-handler.ts",
-                line: 143,
+                line: 136,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1039,11 +1257,11 @@ var InvitationsHandler = class {
               break;
             }
             default: {
-              log4.error("invalid authentication method", {
+              log5.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
                 file: "invitations-handler.ts",
-                line: 161,
+                line: 154,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1062,7 +1280,7 @@ var InvitationsHandler = class {
               throw new Error("Not authenticated");
             }
             const deviceKey = (_c = (_a2 = admissionRequest.device) == null ? void 0 : _a2.deviceKey) != null ? _c : (_b = admissionRequest.space) == null ? void 0 : _b.deviceKey;
-            assert5(deviceKey);
+            assert6(deviceKey);
             const admissionResponse = await protocol.admit(admissionRequest, guestProfile);
             success.wake(deviceKey);
             return admissionResponse;
@@ -1073,22 +1291,22 @@ var InvitationsHandler = class {
         },
         onOpen: () => {
           scheduleTask(ctx, async () => {
-            const traceId = PublicKey4.random().toHex();
+            const traceId = PublicKey5.random().toHex();
             try {
-              log4.trace("dxos.sdk.invitations-handler.host.onOpen", trace2.begin({
+              log5.trace("dxos.sdk.invitations-handler.host.onOpen", trace3.begin({
                 id: traceId,
                 parentId: this._traceParent
               }), {
                 file: "invitations-handler.ts",
-                line: 196,
+                line: 189,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
-              log4("connected", {
+              log5("connected", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 200,
+                line: 193,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1099,12 +1317,12 @@ var InvitationsHandler = class {
               const deviceKey = await success.wait({
                 timeout
               });
-              log4("admitted guest", {
+              log5("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 203,
+                line: 196,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1112,21 +1330,21 @@ var InvitationsHandler = class {
                 ...invitation,
                 state: Invitation2.State.SUCCESS
               });
-              log4.trace("dxos.sdk.invitations-handler.host.onOpen", trace2.end({
+              log5.trace("dxos.sdk.invitations-handler.host.onOpen", trace3.end({
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 205,
+                line: 198,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof TimeoutError) {
-                log4("timeout", {
+                log5("timeout", {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 208,
+                  line: 201,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1135,20 +1353,20 @@ var InvitationsHandler = class {
                   state: Invitation2.State.TIMEOUT
                 });
               } else {
-                log4.error("failed", err, {
+                log5.error("failed", err, {
                   file: "invitations-handler.ts",
-                  line: 211,
+                  line: 204,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
                 stream.error(err);
               }
-              log4.trace("dxos.sdk.invitations-handler.host.onOpen", trace2.error({
+              log5.trace("dxos.sdk.invitations-handler.host.onOpen", trace3.error({
                 id: traceId,
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 214,
+                line: 207,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1159,6 +1377,33 @@ var InvitationsHandler = class {
               }
             }
           });
+        },
+        onError: (err) => {
+          if (err instanceof InvalidInvitationExtensionRoleError2) {
+            return;
+          }
+          if (err instanceof TimeoutError) {
+            log5("timeout", {
+              ...protocol.toJSON()
+            }, {
+              file: "invitations-handler.ts",
+              line: 221,
+              scope: this,
+              callSite: (f, a) => f(...a)
+            });
+            stream.next({
+              ...invitation,
+              state: Invitation2.State.TIMEOUT
+            });
+          } else {
+            log5.error("failed", err, {
+              file: "invitations-handler.ts",
+              line: 224,
+              scope: this,
+              callSite: (f, a) => f(...a)
+            });
+            stream.error(err);
+          }
         }
       });
       extension._traceParent = this._traceParent;
@@ -1195,28 +1440,36 @@ var InvitationsHandler = class {
   }
   acceptInvitation(protocol, invitation) {
     const { timeout = INVITATION_TIMEOUT } = invitation;
-    assert5(protocol);
-    const authenticated = new Trigger2();
+    assert6(protocol);
+    const authenticated = new Trigger3();
+    let currentState;
     const stream = new PushStream();
-    const ctx = new Context3({
+    const setState = (newData) => {
+      assert6(newData.state !== void 0);
+      currentState = newData.state;
+      stream.next({
+        ...invitation,
+        ...newData
+      });
+    };
+    const ctx = new Context4({
       onError: (err) => {
         if (err instanceof TimeoutError) {
-          log4("timeout", {
+          log5("timeout", {
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 267,
+            line: 279,
             scope: this,
             callSite: (f, a) => f(...a)
           });
-          stream.next({
-            ...invitation,
+          setState({
             state: Invitation2.State.TIMEOUT
           });
         } else {
-          log4.warn("auth failed", err, {
+          log5.warn("auth failed", err, {
             file: "invitations-handler.ts",
-            line: 270,
+            line: 282,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1226,11 +1479,11 @@ var InvitationsHandler = class {
       }
     });
     ctx.onDispose(() => {
-      log4("complete", {
+      log5("complete", {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 278,
+        line: 290,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1239,16 +1492,29 @@ var InvitationsHandler = class {
     const createExtension = () => {
       let connectionCount = 0;
       const extension = new InvitationGuestExtension({
-        onOpen: () => {
+        onOpen: (extensionCtx) => {
+          extensionCtx.onDispose(async () => {
+            log5("extension disposed", {
+              currentState
+            }, {
+              file: "invitations-handler.ts",
+              line: 300,
+              scope: this,
+              callSite: (f, a) => f(...a)
+            });
+            if (currentState !== Invitation2.State.SUCCESS) {
+              stream.error(new Error("Remote peer disconnected."));
+            }
+          });
           scheduleTask(ctx, async () => {
-            const traceId = PublicKey4.random().toHex();
+            const traceId = PublicKey5.random().toHex();
             try {
-              log4.trace("dxos.sdk.invitations-handler.guest.onOpen", trace2.begin({
+              log5.trace("dxos.sdk.invitations-handler.guest.onOpen", trace3.begin({
                 id: traceId,
                 parentId: this._traceParent
               }), {
                 file: "invitations-handler.ts",
-                line: 290,
+                line: 309,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1256,33 +1522,32 @@ var InvitationsHandler = class {
                 throw new Error(`multiple connections detected: ${connectionCount}`);
               }
               scheduleTask(ctx, () => ctx.raise(new TimeoutError(timeout)), timeout);
-              log4("connected", {
+              log5("connected", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 301,
+                line: 320,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
-              stream.next({
-                ...invitation,
+              setState({
                 state: Invitation2.State.CONNECTED
               });
-              log4("introduce", {
+              log5("introduce", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 305,
+                line: 324,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               const introductionResponse = await extension.rpc.InvitationHostService.introduce(protocol.createIntroduction());
-              log4("introduce response", {
+              log5("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
                 file: "invitations-handler.ts",
-                line: 309,
+                line: 328,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1292,27 +1557,25 @@ var InvitationsHandler = class {
               }
               if (isAuthenticationRequired(invitation)) {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-                  log4("guest waiting for authentication code...", {}, {
+                  log5("guest waiting for authentication code...", {}, {
                     file: "invitations-handler.ts",
-                    line: 318,
+                    line: 337,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
-                  stream.next({
-                    ...invitation,
+                  setState({
                     state: Invitation2.State.READY_FOR_AUTHENTICATION
                   });
                   const authCode = await authenticated.wait({
                     timeout
                   });
-                  log4("sending authentication request", {}, {
+                  log5("sending authentication request", {}, {
                     file: "invitations-handler.ts",
-                    line: 322,
+                    line: 341,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
-                  stream.next({
-                    ...invitation,
+                  setState({
                     state: Invitation2.State.AUTHENTICATING
                   });
                   const response = await extension.rpc.InvitationHostService.authenticate({
@@ -1325,11 +1588,11 @@ var InvitationsHandler = class {
                     if (attempt === MAX_OTP_ATTEMPTS) {
                       throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
                     } else {
-                      log4("retrying invalid code", {
+                      log5("retrying invalid code", {
                         attempt
                       }, {
                         file: "invitations-handler.ts",
-                        line: 333,
+                        line: 352,
                         scope: this,
                         callSite: (f, a) => f(...a)
                       });
@@ -1338,72 +1601,69 @@ var InvitationsHandler = class {
                   }
                 }
               } else {
-                stream.next({
-                  ...invitation,
+                setState({
                   state: Invitation2.State.READY_FOR_AUTHENTICATION
                 });
               }
-              log4("request admission", {
+              log5("request admission", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 344,
+                line: 363,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               const admissionRequest = await protocol.createAdmissionRequest();
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               const result = await protocol.accept(admissionResponse, admissionRequest);
-              log4("admitted by host", {
+              log5("admitted by host", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 352,
+                line: 371,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
-              stream.next({
-                ...invitation,
+              setState({
                 ...result,
                 state: Invitation2.State.SUCCESS
               });
-              log4.trace("dxos.sdk.invitations-handler.guest.onOpen", trace2.end({
+              log5.trace("dxos.sdk.invitations-handler.guest.onOpen", trace3.end({
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 354,
+                line: 373,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof TimeoutError) {
-                log4("timeout", {
+                log5("timeout", {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 357,
+                  line: 376,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
-                stream.next({
-                  ...invitation,
+                setState({
                   state: Invitation2.State.TIMEOUT
                 });
               } else {
-                log4("auth failed", err, {
+                log5("auth failed", err, {
                   file: "invitations-handler.ts",
-                  line: 360,
+                  line: 379,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
                 stream.error(err);
               }
-              log4.trace("dxos.sdk.invitations-handler.guest.onOpen", trace2.error({
+              log5.trace("dxos.sdk.invitations-handler.guest.onOpen", trace3.error({
                 id: traceId,
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 363,
+                line: 382,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1411,24 +1671,49 @@ var InvitationsHandler = class {
               await ctx.dispose();
             }
           });
+        },
+        onError: (err) => {
+          if (err instanceof InvalidInvitationExtensionRoleError2) {
+            return;
+          }
+          if (err instanceof TimeoutError) {
+            log5("timeout", {
+              ...protocol.toJSON()
+            }, {
+              file: "invitations-handler.ts",
+              line: 393,
+              scope: this,
+              callSite: (f, a) => f(...a)
+            });
+            setState({
+              state: Invitation2.State.TIMEOUT
+            });
+          } else {
+            log5("auth failed", err, {
+              file: "invitations-handler.ts",
+              line: 396,
+              scope: this,
+              callSite: (f, a) => f(...a)
+            });
+            stream.error(err);
+          }
         }
       });
       return extension;
     };
     scheduleTask(ctx, async () => {
-      assert5(invitation.swarmKey);
+      assert6(invitation.swarmKey);
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
-        peerId: PublicKey4.random(),
+        peerId: PublicKey5.random(),
         protocolProvider: createTeleportProtocolFactory(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
         topology: new StarTopology(topic)
       });
       ctx.onDispose(() => swarmConnection.close());
-      stream.next({
-        ...invitation,
+      setState({
         state: Invitation2.State.CONNECTING
       });
     });
@@ -1436,8 +1721,7 @@ var InvitationsHandler = class {
       initialInvitation: invitation,
       subscriber: stream.observable,
       onCancel: async () => {
-        stream.next({
-          ...invitation,
+        setState({
           state: Invitation2.State.CANCELLED
         });
         await ctx.dispose();
@@ -1450,323 +1734,87 @@ var InvitationsHandler = class {
   }
 };
 var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitation2.AuthMethod.NONE;
-var InvitationHostExtension = class extends RpcExtension {
-  constructor(_callbacks) {
-    super({
-      exposed: {
-        InvitationHostService: schema2.getService("dxos.halo.invitations.InvitationHostService")
-      }
-    });
-    this._callbacks = _callbacks;
-  }
-  async getHandlers() {
-    return {
-      // TODO(dmaretskyi): For now this is just forwarding the data to callbacks since we don't have session-specific logic.
-      // Perhaps in the future we will have more complex logic here.
-      InvitationHostService: {
-        introduce: async (request) => {
-          const traceId = PublicKey4.random().toHex();
-          log4.trace("dxos.sdk.invitation-handler.host.introduce", trace2.begin({
-            id: traceId,
-            parentId: this._traceParent
-          }), {
-            file: "invitations-handler.ts",
-            line: 442,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          const response = await this._callbacks.introduce(request);
-          log4.trace("dxos.sdk.invitation-handler.host.introduce", trace2.end({
-            id: traceId
-          }), {
-            file: "invitations-handler.ts",
-            line: 447,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          return response;
-        },
-        authenticate: async (request) => {
-          const traceId = PublicKey4.random().toHex();
-          log4.trace("dxos.sdk.invitation-handler.host.authenticate", trace2.begin({
-            id: traceId,
-            parentId: this._traceParent
-          }), {
-            file: "invitations-handler.ts",
-            line: 453,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          const response = await this._callbacks.authenticate(request);
-          log4.trace("dxos.sdk.invitation-handler.host.authenticate", trace2.end({
-            id: traceId,
-            data: {
-              ...response
-            }
-          }), {
-            file: "invitations-handler.ts",
-            line: 458,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          return response;
-        },
-        admit: async (request) => {
-          const traceId = PublicKey4.random().toHex();
-          log4.trace("dxos.sdk.invitation-handler.host.admit", trace2.begin({
-            id: traceId,
-            parentId: this._traceParent
-          }), {
-            file: "invitations-handler.ts",
-            line: 464,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          const response = await this._callbacks.admit(request);
-          log4.trace("dxos.sdk.invitation-handler.host.admit", trace2.end({
-            id: traceId
-          }), {
-            file: "invitations-handler.ts",
-            line: 469,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          return response;
-        }
-      }
-    };
-  }
-  async onOpen(context) {
-    await super.onOpen(context);
-    this._callbacks.onOpen();
-  }
-};
-var InvitationGuestExtension = class extends RpcExtension {
-  constructor(_callbacks) {
-    super({
-      requested: {
-        InvitationHostService: schema2.getService("dxos.halo.invitations.InvitationHostService")
-      }
-    });
-    this._callbacks = _callbacks;
-  }
-  async getHandlers() {
-    return {};
-  }
-  async onOpen(context) {
-    await super.onOpen(context);
-    this._callbacks.onOpen();
-  }
-};
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
-import assert6 from "@dxos/node-std/assert";
+import assert7 from "@dxos/node-std/assert";
+import { Event as Event3 } from "@dxos/async";
 import { Stream as Stream7 } from "@dxos/codec-protobuf";
-import { log as log5 } from "@dxos/log";
-import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
+import { log as log6 } from "@dxos/log";
+import { QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
 var InvitationsServiceImpl = class {
   constructor(_invitationsHandler, _getHandler) {
     this._invitationsHandler = _invitationsHandler;
     this._getHandler = _getHandler;
     this._createInvitations = /* @__PURE__ */ new Map();
     this._acceptInvitations = /* @__PURE__ */ new Map();
+    this._invitationCreated = new Event3();
+    this._invitationAccepted = new Event3();
+    this._removedCreated = new Event3();
+    this._removedAccepted = new Event3();
   }
   // TODO(burdon): Guest/host label.
   getLoggingContext() {
     return {};
   }
-  createInvitation(invitation) {
+  createInvitation(options) {
+    let invitation;
+    const existingInvitation = this._createInvitations.get(options.invitationId);
+    if (existingInvitation) {
+      invitation = existingInvitation;
+    } else {
+      const handler = this._getHandler(options);
+      invitation = this._invitationsHandler.createInvitation(handler, options);
+      this._createInvitations.set(invitation.get().invitationId, invitation);
+      this._invitationCreated.emit(invitation.get());
+    }
     return new Stream7(({ next, close }) => {
-      const handler = this._getHandler(invitation);
-      log5("stream opened", this.getLoggingContext(), {
-        file: "invitations-service.ts",
-        line: 37,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
-      let invitationId;
-      const observable = this._invitationsHandler.createInvitation(handler, invitation);
-      observable.subscribe((invitation2) => {
-        switch (invitation2.state) {
-          case Invitation3.State.CONNECTING: {
-            assert6(invitation2.invitationId);
-            invitationId = invitation2.invitationId;
-            this._createInvitations.set(invitation2.invitationId, observable);
-            invitation2.state = Invitation3.State.CONNECTING;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.CONNECTED: {
-            assert6(invitation2.invitationId);
-            invitation2.state = Invitation3.State.CONNECTED;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.READY_FOR_AUTHENTICATION: {
-            assert6(invitation2.invitationId);
-            invitation2.state = Invitation3.State.READY_FOR_AUTHENTICATION;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.AUTHENTICATING: {
-            assert6(invitation2.invitationId);
-            invitation2.state = Invitation3.State.AUTHENTICATING;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.SUCCESS: {
-            assert6(invitation2.invitationId);
-            invitation2.state = Invitation3.State.SUCCESS;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.CANCELLED: {
-            assert6(invitationId);
-            invitation2.invitationId = invitationId;
-            invitation2.state = Invitation3.State.CANCELLED;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.TIMEOUT: {
-            assert6(invitationId);
-            invitation2.invitationId = invitationId;
-            invitation2.state = Invitation3.State.TIMEOUT;
-            next(invitation2);
-            break;
-          }
-        }
+      invitation.subscribe((invitation2) => {
+        next(invitation2);
       }, (err) => {
         close(err);
       }, () => {
         close();
+        this._createInvitations.delete(invitation.get().invitationId);
       });
-      return (err) => {
-        const context = this.getLoggingContext();
-        if (err) {
-          log5.warn("stream closed", {
-            ...context,
-            err
-          }, {
-            file: "invitations-service.ts",
-            line: 103,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        } else {
-          log5("stream closed", context, {
-            file: "invitations-service.ts",
-            line: 105,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        }
-        this._createInvitations.delete(invitation.invitationId);
-      };
     });
   }
-  acceptInvitation(invitation) {
+  acceptInvitation(options) {
+    let invitation;
+    const existingInvitation = this._acceptInvitations.get(options.invitationId);
+    if (existingInvitation) {
+      invitation = existingInvitation;
+    } else {
+      const handler = this._getHandler(options);
+      invitation = this._invitationsHandler.acceptInvitation(handler, options);
+      this._acceptInvitations.set(invitation.get().invitationId, invitation);
+      this._invitationAccepted.emit(invitation.get());
+    }
     return new Stream7(({ next, close }) => {
-      log5("stream opened", this.getLoggingContext(), {
-        file: "invitations-service.ts",
-        line: 115,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
-      const handler = this._getHandler(invitation);
-      let invitationId;
-      const observable = this._invitationsHandler.acceptInvitation(handler, invitation);
-      observable.subscribe((invitation2) => {
-        switch (invitation2.state) {
-          case Invitation3.State.CONNECTING: {
-            assert6(invitation2.invitationId);
-            invitationId = invitation2.invitationId;
-            this._acceptInvitations.set(invitation2.invitationId, observable);
-            invitation2.state = Invitation3.State.CONNECTING;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.CONNECTED: {
-            assert6(invitation2.invitationId);
-            invitation2.state = Invitation3.State.CONNECTED;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.READY_FOR_AUTHENTICATION: {
-            assert6(invitation2.invitationId);
-            invitation2.state = Invitation3.State.READY_FOR_AUTHENTICATION;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.AUTHENTICATING: {
-            assert6(invitation2.invitationId);
-            invitation2.state = Invitation3.State.AUTHENTICATING;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.SUCCESS: {
-            invitation2.state = Invitation3.State.SUCCESS;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.CANCELLED: {
-            assert6(invitationId);
-            invitation2.invitationId = invitationId;
-            invitation2.state = Invitation3.State.CANCELLED;
-            next(invitation2);
-            break;
-          }
-          case Invitation3.State.TIMEOUT: {
-            assert6(invitationId);
-            invitation2.invitationId = invitationId;
-            invitation2.state = Invitation3.State.TIMEOUT;
-            next(invitation2);
-            break;
-          }
-        }
+      invitation.subscribe((invitation2) => {
+        next(invitation2);
       }, (err) => {
         close(err);
       }, () => {
         close();
+        this._acceptInvitations.delete(invitation.get().invitationId);
       });
-      return (err) => {
-        const context = this.getLoggingContext();
-        if (err) {
-          log5.warn("stream closed", {
-            ...context,
-            err
-          }, {
-            file: "invitations-service.ts",
-            line: 181,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        } else {
-          log5("stream closed", context, {
-            file: "invitations-service.ts",
-            line: 183,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        }
-        this._acceptInvitations.delete(invitation.invitationId);
-      };
     });
   }
   async authenticate({ invitationId, authCode }) {
-    log5("authenticating...", {}, {
+    log6("authenticating...", {}, {
       file: "invitations-service.ts",
-      line: 192,
+      line: 103,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    assert6(invitationId);
+    assert7(invitationId);
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      log5.warn("invalid invitation", {
+      log6.warn("invalid invitation", {
         invitationId
       }, {
         file: "invitations-service.ts",
-        line: 196,
+        line: 107,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1775,36 +1823,92 @@ var InvitationsServiceImpl = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    var _a;
-    log5("cancelling...", {}, {
+    log6("deleting...", {}, {
       file: "invitations-service.ts",
-      line: 203,
+      line: 114,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    assert6(invitationId);
-    const observable = (_a = this._createInvitations.get(invitationId)) != null ? _a : this._acceptInvitations.get(invitationId);
-    if (!observable) {
-      log5.warn("invalid invitation", {
+    assert7(invitationId);
+    const created = this._createInvitations.get(invitationId);
+    const accepted = this._acceptInvitations.get(invitationId);
+    if (created) {
+      await created.cancel();
+      this._createInvitations.delete(invitationId);
+      this._removedCreated.emit(created.get());
+    } else if (accepted) {
+      await accepted.cancel();
+      this._acceptInvitations.delete(invitationId);
+      this._removedAccepted.emit(accepted.get());
+    } else {
+      log6.warn("invalid invitation", {
         invitationId
       }, {
         file: "invitations-service.ts",
-        line: 207,
+        line: 127,
         scope: this,
         callSite: (f, a) => f(...a)
       });
-    } else {
-      await (observable == null ? void 0 : observable.cancel());
     }
   }
+  queryInvitations() {
+    return new Stream7(({ next, ctx }) => {
+      this._invitationCreated.on(ctx, (invitation) => {
+        next({
+          action: QueryInvitationsResponse.Action.ADDED,
+          type: QueryInvitationsResponse.Type.CREATED,
+          invitations: [
+            invitation
+          ]
+        });
+      });
+      this._invitationAccepted.on(ctx, (invitation) => {
+        next({
+          action: QueryInvitationsResponse.Action.ADDED,
+          type: QueryInvitationsResponse.Type.ACCEPTED,
+          invitations: [
+            invitation
+          ]
+        });
+      });
+      this._removedCreated.on(ctx, (invitation) => {
+        next({
+          action: QueryInvitationsResponse.Action.REMOVED,
+          type: QueryInvitationsResponse.Type.CREATED,
+          invitations: [
+            invitation
+          ]
+        });
+      });
+      this._removedAccepted.on(ctx, (invitation) => {
+        next({
+          action: QueryInvitationsResponse.Action.REMOVED,
+          type: QueryInvitationsResponse.Type.ACCEPTED,
+          invitations: [
+            invitation
+          ]
+        });
+      });
+      next({
+        action: QueryInvitationsResponse.Action.ADDED,
+        type: QueryInvitationsResponse.Type.CREATED,
+        invitations: Array.from(this._createInvitations.values()).map((invitation) => invitation.get())
+      });
+      next({
+        action: QueryInvitationsResponse.Action.ADDED,
+        type: QueryInvitationsResponse.Type.ACCEPTED,
+        invitations: Array.from(this._acceptInvitations.values()).map((invitation) => invitation.get())
+      });
+    });
+  }
 };
 
 // packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts
-import assert7 from "@dxos/node-std/assert";
+import assert8 from "@dxos/node-std/assert";
 import { createAdmissionCredentials, getCredentialAssertion } from "@dxos/credentials";
 import { writeMessages as writeMessages2 } from "@dxos/feed-store";
-import { log as log6 } from "@dxos/log";
-import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
+import { log as log7 } from "@dxos/log";
+import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
 var SpaceInvitationProtocol = class {
   constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
     this._spaceManager = _spaceManager;
@@ -1820,18 +1924,18 @@ var SpaceInvitationProtocol = class {
   }
   getInvitationContext() {
     return {
-      kind: Invitation4.Kind.SPACE,
+      kind: Invitation3.Kind.SPACE,
       spaceKey: this._spaceKey
     };
   }
   async admit(request, guestProfile) {
     var _a;
-    assert7(this._spaceKey);
+    assert8(this._spaceKey);
     const space = await this._spaceManager.spaces.get(this._spaceKey);
-    assert7(space);
-    assert7(request.space);
+    assert8(space);
+    assert8(request.space);
     const { identityKey, deviceKey } = request.space;
-    log6("writing guest credentials", {
+    log7("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: deviceKey
     }, {
@@ -1841,9 +1945,9 @@ var SpaceInvitationProtocol = class {
       callSite: (f, a) => f(...a)
     });
     const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
-    assert7(credentials[0].credential);
+    assert8(credentials[0].credential);
     const spaceMemberCredential = credentials[0].credential.credential;
-    assert7(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    assert8(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
     await writeMessages2(space.inner.controlPipeline.writer, credentials);
     return {
       space: {
@@ -1871,11 +1975,11 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    assert7(response.space);
+    assert8(response.space);
     const { credential, controlTimeframe, dataTimeframe } = response.space;
     const assertion = getCredentialAssertion(credential);
-    assert7(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential");
-    assert7(credential.subject.id.equals(this._signingContext.identityKey));
+    assert8(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential");
+    assert8(credential.subject.id.equals(this._signingContext.identityKey));
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,
       genesisFeedKey: assertion.genesisFeedKey,
@@ -1937,15 +2041,15 @@ var toStorageType = (type) => {
 };
 
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
-import assert8 from "@dxos/node-std/assert";
-import { Event as Event3 } from "@dxos/async";
+import assert9 from "@dxos/node-std/assert";
+import { Event as Event4 } from "@dxos/async";
 import { appServiceBundle, shellServiceBundle } from "@dxos/client";
 import { ShellLayout } from "@dxos/protocols/proto/dxos/iframe";
 import { createProtoRpcPeer } from "@dxos/rpc";
 var ShellRuntimeImpl = class {
   constructor(_port) {
     this._port = _port;
-    this.layoutUpdate = new Event3();
+    this.layoutUpdate = new Event4();
     this._layout = ShellLayout.DEFAULT;
   }
   get layout() {
@@ -1967,7 +2071,7 @@ var ShellRuntimeImpl = class {
     });
   }
   async setAppContext(context) {
-    assert8(this._appRpc, "runtime not open");
+    assert9(this._appRpc, "runtime not open");
     await this._appRpc.rpc.AppService.setContext(context);
   }
   async open() {
@@ -1996,8 +2100,8 @@ var ShellRuntimeImpl = class {
 };
 var MemoryShellRuntime = class {
   constructor({ layout, invitationCode, spaceKey } = {}) {
-    this.layoutUpdate = new Event3();
-    this.contextUpdate = new Event3();
+    this.layoutUpdate = new Event4();
+    this.contextUpdate = new Event4();
     this._layout = layout != null ? layout : ShellLayout.DEFAULT;
     this._invitationCode = invitationCode;
     this._spaceKey = spaceKey;
@@ -2026,19 +2130,19 @@ var MemoryShellRuntime = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-import { Trigger as Trigger8 } from "@dxos/async";
-import { log as log17, logInfo as logInfo3 } from "@dxos/log";
+import { Trigger as Trigger9 } from "@dxos/async";
+import { log as log19, logInfo as logInfo3 } from "@dxos/log";
 import { MemorySignalManager as MemorySignalManager3, MemorySignalManagerContext as MemorySignalManagerContext3, WebsocketSignalManager as WebsocketSignalManager3 } from "@dxos/messaging";
 import { createWebRTCTransportFactory as createWebRTCTransportFactory2, NetworkManager as NetworkManager3 } from "@dxos/network-manager";
 import { getAsyncValue } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-import assert13 from "@dxos/node-std/assert";
-import { Event as Event7 } from "@dxos/async";
-import { clientServiceBundle, createDefaultModelFactory, PublicKey as PublicKey9 } from "@dxos/client";
+import assert14 from "@dxos/node-std/assert";
+import { Event as Event8 } from "@dxos/async";
+import { clientServiceBundle, createDefaultModelFactory, PublicKey as PublicKey10 } from "@dxos/client";
 import { DataServiceImpl } from "@dxos/echo-pipeline";
-import { log as log15 } from "@dxos/log";
-import { trace as trace5 } from "@dxos/protocols";
+import { log as log17 } from "@dxos/log";
+import { trace as trace6 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
 
 // packages/sdk/client-services/src/packlets/deprecated/tracing.ts
@@ -2124,36 +2228,36 @@ var NetworkServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-import assert10 from "@dxos/node-std/assert";
-import { Event as Event6, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
+import assert11 from "@dxos/node-std/assert";
+import { Event as Event7, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { SpaceState as SpaceState2 } from "@dxos/client";
-import { cancelWithContext, Context as Context6 } from "@dxos/context";
+import { cancelWithContext as cancelWithContext2, Context as Context7 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
 import { SnapshotManager, spaceGenesis } from "@dxos/echo-pipeline";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
-import { trace as trace3 } from "@dxos/protocols";
+import { PublicKey as PublicKey8 } from "@dxos/keys";
+import { log as log10 } from "@dxos/log";
+import { trace as trace4 } from "@dxos/protocols";
 import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
 import { ComplexMap as ComplexMap3, deferFunction as deferFunction2 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event5, scheduleTask as scheduleTask3, trackLeaks } from "@dxos/async";
+import { Event as Event6, scheduleTask as scheduleTask3, trackLeaks } from "@dxos/async";
 import { SpaceState } from "@dxos/client";
-import { Context as Context5 } from "@dxos/context";
+import { Context as Context6 } from "@dxos/context";
 import { timed } from "@dxos/debug";
 import { createMappedFeedWriter, DataPipeline } from "@dxos/echo-pipeline";
 import { CancelledError, SystemError } from "@dxos/errors";
-import { PublicKey as PublicKey6 } from "@dxos/keys";
-import { log as log8 } from "@dxos/log";
+import { PublicKey as PublicKey7 } from "@dxos/keys";
+import { log as log9 } from "@dxos/log";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import assert9 from "@dxos/node-std/assert";
-import { DeferredTask, Event as Event4, scheduleTask as scheduleTask2, sleep as sleep2, TimeoutError as TimeoutError2, Trigger as Trigger3 } from "@dxos/async";
-import { Context as Context4, rejectOnDispose } from "@dxos/context";
-import { PublicKey as PublicKey5 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
+import assert10 from "@dxos/node-std/assert";
+import { DeferredTask, Event as Event5, scheduleTask as scheduleTask2, sleep as sleep2, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
+import { Context as Context5, rejectOnDispose } from "@dxos/context";
+import { PublicKey as PublicKey6 } from "@dxos/keys";
+import { log as log8 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
 import { ComplexMap as ComplexMap2, ComplexSet, entry } from "@dxos/util";
@@ -2162,11 +2266,11 @@ var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new Context4();
-    this._extensionOpened = new Event4();
+    this._ctx = new Context5();
+    this._extensionOpened = new Event5();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new ComplexSet(PublicKey5.hash);
-    this._processCredentialsTriggers = new ComplexMap2(PublicKey5.hash);
+    this._processedCredentials = new ComplexSet(PublicKey6.hash);
+    this._processCredentialsTriggers = new ComplexMap2(PublicKey6.hash);
   }
   async open() {
   }
@@ -2177,7 +2281,7 @@ var NotarizationPlugin = class {
   * Request credentials to be notarized.
   */
   async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
-    log7("notarize", {
+    log8("notarize", {
       credentials
     }, {
       file: "notarization-plugin.ts",
@@ -2185,11 +2289,11 @@ var NotarizationPlugin = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    assert9(credentials.every((credential) => credential.id), "Credentials must have an id");
-    const errors = new Trigger3();
+    assert10(credentials.every((credential) => credential.id), "Credentials must have an id");
+    const errors = new Trigger4();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        log7.warn("Notarization error", {
+        log8.warn("Notarization error", {
           err
         }, {
           file: "notarization-plugin.ts",
@@ -2204,7 +2308,7 @@ var NotarizationPlugin = class {
     opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       scheduleTask2(ctx, () => {
-        log7.warn("Notarization timeout", {
+        log8.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
@@ -2228,7 +2332,7 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          log7.warn("Exhausted all peers to notarize with", {
+          log8.warn("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
             file: "notarization-plugin.ts",
@@ -2241,7 +2345,7 @@ var NotarizationPlugin = class {
           return;
         }
         peersTried.add(peer);
-        log7("try notarizing", {
+        log8("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
@@ -2253,7 +2357,7 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        log7("success", {}, {
+        log8("success", {}, {
           file: "notarization-plugin.ts",
           line: 142,
           scope: this,
@@ -2261,7 +2365,7 @@ var NotarizationPlugin = class {
         });
         await sleep2(successDelay);
       } catch (err) {
-        log7.warn("error notarizing (recoverable)", err, {
+        log8.warn("error notarizing (recoverable)", err, {
           file: "notarization-plugin.ts",
           line: 145,
           scope: this,
@@ -2278,7 +2382,7 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      log7("done", {}, {
+      log8("done", {}, {
         file: "notarization-plugin.ts",
         line: 155,
         scope: this,
@@ -2301,14 +2405,14 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    assert9(!this._writer, "Writer already set.");
+    assert10(!this._writer, "Writer already set.");
     this._writer = writer;
   }
   async _waitUntilProcessed(id) {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger3()).value.wait();
+    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger4()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -2319,7 +2423,7 @@ var NotarizationPlugin = class {
       throw new Error("Writer not set");
     }
     for (const credential of (_a = request.credentials) != null ? _a : []) {
-      assert9(credential.id, "Credential must have an id");
+      assert10(credential.id, "Credential must have an id");
       if (this._processedCredentials.has(credential.id)) {
         continue;
       }
@@ -2329,7 +2433,7 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        log7("extension opened", {
+        log8("extension opened", {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
@@ -2341,7 +2445,7 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        log7("extension closed", {
+        log8("extension closed", {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
@@ -2401,9 +2505,9 @@ var __decorate = function(decorators, target, key, desc) {
 var AUTH_TIMEOUT2 = 3e4;
 var DataSpace = class DataSpace2 {
   constructor(params) {
-    this._ctx = new Context5();
+    this._ctx = new Context6();
     this._state = SpaceState.CLOSED;
-    this.stateUpdate = new Event5();
+    this.stateUpdate = new Event6();
     var _a;
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
@@ -2424,7 +2528,7 @@ var DataSpace = class DataSpace2 {
       snapshotId: params.snapshotId
     });
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet2(PublicKey6.hash, Array.from(this._inner.spaceState.members.keys())),
+      trustedKeysProvider: () => new ComplexSet2(PublicKey7.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT2
     });
@@ -2483,7 +2587,7 @@ var DataSpace = class DataSpace2 {
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof CancelledError) {
-          log8("Data pipeline initialization cancelled", err, {
+          log9("Data pipeline initialization cancelled", err, {
             file: "data-space.ts",
             line: 178,
             scope: this,
@@ -2491,7 +2595,7 @@ var DataSpace = class DataSpace2 {
           });
           return;
         }
-        log8.error("Error initializing data pipeline", err, {
+        log9.error("Error initializing data pipeline", err, {
           file: "data-space.ts",
           line: 182,
           scope: this,
@@ -2511,7 +2615,7 @@ var DataSpace = class DataSpace2 {
       breakOnStall: false
     });
     await this._createWritableFeeds();
-    log8("Writable feeds created", {}, {
+    log9("Writable feeds created", {}, {
       file: "data-space.ts",
       line: 200,
       scope: this,
@@ -2532,7 +2636,7 @@ var DataSpace = class DataSpace2 {
         return pipeline;
       }
     });
-    log8("waiting for data pipeline to reach target timeframe", {}, {
+    log9("waiting for data pipeline to reach target timeframe", {}, {
       file: "data-space.ts",
       line: 220,
       scope: this,
@@ -2542,7 +2646,7 @@ var DataSpace = class DataSpace2 {
       ctx: this._ctx,
       breakOnStall: false
     });
-    log8("data pipeline ready", {}, {
+    log9("data pipeline ready", {}, {
       file: "data-space.ts",
       line: 227,
       scope: this,
@@ -2625,24 +2729,24 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._modelFactory = _modelFactory;
     this._feedStore = _feedStore;
     this._snapshotStore = _snapshotStore;
-    this._ctx = new Context6();
-    this.updated = new Event6();
-    this._spaces = new ComplexMap3(PublicKey7.hash);
+    this._ctx = new Context7();
+    this.updated = new Event7();
+    this._spaces = new ComplexMap3(PublicKey8.hash);
     this._isOpen = false;
-    this._instanceId = PublicKey7.random().toHex();
+    this._instanceId = PublicKey8.random().toHex();
   }
   // TODO(burdon): Remove.
   get spaces() {
     return this._spaces;
   }
   async open() {
-    log9("open", {}, {
+    log10("open", {}, {
       file: "data-space-manager.ts",
       line: 83,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    log9.trace("dxos.echo.data-space-manager", trace3.begin({
+    log10.trace("dxos.echo.data-space-manager", trace4.begin({
       id: this._instanceId,
       parentId: this._traceParent
     }), {
@@ -2652,7 +2756,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       callSite: (f, a) => f(...a)
     });
     await this._metadataStore.load();
-    log9("metadata loaded", {
+    log10("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
       file: "data-space-manager.ts",
@@ -2661,7 +2765,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       callSite: (f, a) => f(...a)
     });
     for (const spaceMetadata of this._metadataStore.spaces) {
-      log9("load space", {
+      log10("load space", {
         spaceMetadata
       }, {
         file: "data-space-manager.ts",
@@ -2676,7 +2780,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     this.updated.emit();
   }
   async close() {
-    log9("close", {}, {
+    log10("close", {}, {
       file: "data-space-manager.ts",
       line: 100,
       scope: this,
@@ -2687,7 +2791,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     for (const space of this._spaces.values()) {
       await space.close();
     }
-    log9.trace("dxos.echo.data-space-manager", trace3.end({
+    log10.trace("dxos.echo.data-space-manager", trace4.end({
       id: this._instanceId
     }), {
       file: "data-space-manager.ts",
@@ -2700,7 +2804,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    assert10(this._isOpen, "Not open.");
+    assert11(this._isOpen, "Not open.");
     const spaceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const dataFeedKey = await this._keyring.createKey();
@@ -2710,7 +2814,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       controlFeedKey,
       dataFeedKey
     };
-    log9("creating space...", {
+    log10("creating space...", {
       spaceKey
     }, {
       file: "data-space-manager.ts",
@@ -2722,7 +2826,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    assert10(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    assert11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline();
     this.updated.emit();
@@ -2730,7 +2834,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    log9("accept space", {
+    log10("accept space", {
       opts
     }, {
       file: "data-space-manager.ts",
@@ -2738,8 +2842,8 @@ var DataSpaceManager = class DataSpaceManager2 {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    assert10(this._isOpen, "Not open.");
-    assert10(!this._spaces.has(opts.spaceKey), "Space already exists.");
+    assert11(this._isOpen, "Not open.");
+    assert11(!this._spaces.has(opts.spaceKey), "Space already exists.");
     const metadata = {
       key: opts.spaceKey,
       genesisFeedKey: opts.genesisFeedKey,
@@ -2758,13 +2862,13 @@ var DataSpaceManager = class DataSpaceManager2 {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await cancelWithContext(this._ctx, this.updated.waitForCondition(() => {
+    await cancelWithContext2(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === SpaceState2.READY;
     }));
   }
   async _constructSpace(metadata) {
-    log9("construct space", {
+    log10("construct space", {
       metadata
     }, {
       file: "data-space-manager.ts",
@@ -2819,7 +2923,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       snapshotId: metadata.snapshot,
       callbacks: {
         beforeReady: async () => {
-          log9("before space ready", {
+          log10("before space ready", {
             space: space.key
           }, {
             file: "data-space-manager.ts",
@@ -2830,7 +2934,7 @@ var DataSpaceManager = class DataSpaceManager2 {
           this._dataServiceSubscriptions.registerSpace(space.key, dataSpace.dataPipeline.databaseBackend.createDataServiceHost());
         },
         afterReady: async () => {
-          log9("after space ready", {
+          log10("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
@@ -2877,7 +2981,7 @@ import { EventSubscriptions as EventSubscriptions3, scheduleTask as scheduleTask
 import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { raise, todo as todo2 } from "@dxos/debug";
 import { SpaceNotFoundError } from "@dxos/echo-pipeline";
-import { log as log10 } from "@dxos/log";
+import { log as log11 } from "@dxos/log";
 import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { humanize } from "@dxos/util";
 var TIMEFRAME_UPDATE_DEBOUNCE_TIME = 500;
@@ -2904,7 +3008,7 @@ var SpacesServiceImpl = class {
       const onUpdate = async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._transformSpace(space));
-        log10("update", {
+        log11("update", {
           spaces
         }, {
           file: "spaces-service.ts",
@@ -3060,6 +3164,8 @@ var SystemServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
 import { iframeServiceBundle, workerServiceBundle } from "@dxos/client";
+import { RemoteServiceConnectionError } from "@dxos/errors";
+import { log as log12 } from "@dxos/log";
 import { WebRTCTransportService } from "@dxos/network-manager";
 import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
 var IFrameProxyRuntime = class {
@@ -3103,7 +3209,7 @@ var IFrameProxyRuntime = class {
         }
       },
       port: this._systemPort,
-      timeout: 200
+      timeout: 1e3
     });
     this._workerAppPort.subscribe((msg) => this._windowAppPort.send(msg));
     this._windowAppPort.subscribe((msg) => this._workerAppPort.send(msg));
@@ -3116,10 +3222,20 @@ var IFrameProxyRuntime = class {
   }
   async open(origin) {
     var _a;
-    await this._systemRpc.open();
-    await this._systemRpc.rpc.WorkerService.start({
-      origin
-    });
+    try {
+      await this._systemRpc.open();
+      await this._systemRpc.rpc.WorkerService.start({
+        origin
+      });
+    } catch (err) {
+      log12.catch(err, {}, {
+        file: "iframe-proxy-runtime.ts",
+        line: 79,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      throw new RemoteServiceConnectionError("Failed to connect to worker");
+    }
     await ((_a = this._shellRuntime) == null ? void 0 : _a.open());
   }
   async close() {
@@ -3131,8 +3247,8 @@ var IFrameProxyRuntime = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/vault-resource-lock.ts
-import { asyncTimeout, Trigger as Trigger4 } from "@dxos/async";
-import { log as log11, logInfo } from "@dxos/log";
+import { asyncTimeout, Trigger as Trigger5 } from "@dxos/async";
+import { log as log13, logInfo } from "@dxos/log";
 var __decorate3 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -3150,7 +3266,7 @@ var Message;
 var VaultResourceLock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new Trigger4();
+    this._releaseTrigger = new Trigger5();
     this._lockKey = lockKey;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -3164,28 +3280,28 @@ var VaultResourceLock = class {
       message: Message.ACQUIRING
     });
     try {
-      log11("aquiring lock...", {}, {
+      log13("aquiring lock...", {}, {
         file: "vault-resource-lock.ts",
         line: 44,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       await asyncTimeout(this._requestLock(), 3e3);
-      log11("acquired lock", {}, {
+      log13("acquired lock", {}, {
         file: "vault-resource-lock.ts",
         line: 46,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     } catch (e) {
-      log11("stealing lock...", {}, {
+      log13("stealing lock...", {}, {
         file: "vault-resource-lock.ts",
         line: 48,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       await this._requestLock(true);
-      log11("stolen lock", {}, {
+      log13("stolen lock", {}, {
         file: "vault-resource-lock.ts",
         line: 50,
         scope: this,
@@ -3202,7 +3318,7 @@ var VaultResourceLock = class {
     }
   }
   async _requestLock(steal = false) {
-    log11("requesting lock...", {
+    log13("requesting lock...", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3210,23 +3326,23 @@ var VaultResourceLock = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const acquired = new Trigger4();
+    const acquired = new Trigger5();
     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 Trigger4();
+      this._releaseTrigger = new Trigger5();
       await this._releaseTrigger.wait();
-      log11("releasing lock...", {}, {
+      log13("releasing lock...", {}, {
         file: "vault-resource-lock.ts",
         line: 74,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       await ((_b = this._onRelease) == null ? void 0 : _b.call(this));
-      log11("released lock", {}, {
+      log13("released lock", {}, {
         file: "vault-resource-lock.ts",
         line: 76,
         scope: this,
@@ -3237,7 +3353,7 @@ var VaultResourceLock = class {
       await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
     });
     await acquired.wait();
-    log11("recieved lock", {
+    log13("recieved lock", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3252,16 +3368,16 @@ __decorate3([
 ], VaultResourceLock.prototype, "lockKey", null);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-import { Trigger as Trigger6 } from "@dxos/async";
-import { log as log13 } from "@dxos/log";
+import { Trigger as Trigger7 } from "@dxos/async";
+import { log as log15 } from "@dxos/log";
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from "@dxos/messaging";
 import { NetworkManager, WebRTCTransportProxyFactory } from "@dxos/network-manager";
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
-import assert11 from "@dxos/node-std/assert";
-import { asyncTimeout as asyncTimeout2, Trigger as Trigger5 } from "@dxos/async";
+import assert12 from "@dxos/node-std/assert";
+import { asyncTimeout as asyncTimeout2, Trigger as Trigger6 } from "@dxos/async";
 import { iframeServiceBundle as iframeServiceBundle2, workerServiceBundle as workerServiceBundle2 } from "@dxos/client";
-import { log as log12, logInfo as logInfo2 } from "@dxos/log";
+import { log as log14, logInfo as logInfo2 } from "@dxos/log";
 import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
 import { Callback } from "@dxos/util";
 
@@ -3333,10 +3449,10 @@ var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal, options = {
     heartbeatInterval: 1e3
   } }) {
-    this._startTrigger = new Trigger5();
+    this._startTrigger = new Trigger6();
     this.onClose = new Callback();
-    assert11(options);
-    assert11(serviceHost);
+    assert12(options);
+    assert12(serviceHost);
     this._options = options;
     this._serviceHost = serviceHost;
     const middleware = {
@@ -3383,7 +3499,7 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                log12.catch(err, {}, {
+                log14.catch(err, {}, {
                   file: "worker-session.ts",
                   line: 107,
                   scope: this,
@@ -3401,7 +3517,7 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    log12.info("opening..", {}, {
+    log14.info("opening..", {}, {
       file: "worker-session.ts",
       line: 121,
       scope: this,
@@ -3419,7 +3535,7 @@ var WorkerSession = class {
       try {
         await this._iframeRpc.rpc.IframeService.heartbeat();
       } catch (err1) {
-        log12.warn("Heartbeat failed", {
+        log14.warn("Heartbeat failed", {
           err: err1
         }, {
           file: "worker-session.ts",
@@ -3430,7 +3546,7 @@ var WorkerSession = class {
         try {
           await this.close();
         } catch (err) {
-          log12.catch(err, {}, {
+          log14.catch(err, {}, {
             file: "worker-session.ts",
             line: 137,
             scope: this,
@@ -3441,7 +3557,7 @@ var WorkerSession = class {
     }, this._options.heartbeatInterval);
   }
   async close() {
-    log12.info("closing..", {}, {
+    log14.info("closing..", {}, {
       file: "worker-session.ts",
       line: 144,
       scope: this,
@@ -3450,7 +3566,7 @@ var WorkerSession = class {
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      log12.catch(err, {}, {
+      log14.catch(err, {}, {
         file: "worker-session.ts",
         line: 148,
         scope: this,
@@ -3469,7 +3585,7 @@ var WorkerSession = class {
     try {
       await asyncTimeout2(this._shellClientRpc.open(), 1e3);
     } catch (e) {
-      log12.info("No shell connected.", {}, {
+      log14.info("No shell connected.", {}, {
         file: "worker-session.ts",
         line: 162,
         scope: this,
@@ -3488,7 +3604,7 @@ var WorkerRuntime = class {
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new WebRTCTransportProxyFactory();
-    this._ready = new Trigger6();
+    this._ready = new Trigger7();
     this.sessions = /* @__PURE__ */ new Set();
     this._clientServices = new ClientServicesHost();
   }
@@ -3496,7 +3612,7 @@ var WorkerRuntime = class {
     return this._clientServices;
   }
   async start() {
-    log13("starting...", {}, {
+    log15("starting...", {}, {
       file: "worker-runtime.ts",
       line: 48,
       scope: this,
@@ -3504,20 +3620,18 @@ var WorkerRuntime = class {
     });
     try {
       this._config = await this._configProvider();
-      const signalServer = this._config.get("runtime.services.signal.server");
+      const signals = this._config.get("runtime.services.signaling");
       this._clientServices.initialize({
         config: this._config,
         networkManager: new NetworkManager({
           log: true,
-          signalManager: signalServer ? new WebsocketSignalManager([
-            signalServer
-          ]) : new MemorySignalManager(new MemorySignalManagerContext()),
+          signalManager: signals ? new WebsocketSignalManager(signals) : new MemorySignalManager(new MemorySignalManagerContext()),
           transportFactory: this._transportFactory
         })
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
-      log13("started", {}, {
+      log15("started", {}, {
         file: "worker-runtime.ts",
         line: 65,
         scope: this,
@@ -3525,7 +3639,7 @@ var WorkerRuntime = class {
       });
     } catch (err) {
       this._ready.wake(err);
-      log13.catch(err, {}, {
+      log15.catch(err, {}, {
         file: "worker-runtime.ts",
         line: 68,
         scope: this,
@@ -3577,27 +3691,27 @@ var WorkerRuntime = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-import assert12 from "@dxos/node-std/assert";
-import { Trigger as Trigger7 } from "@dxos/async";
-import { Invitation as Invitation5 } from "@dxos/client";
+import assert13 from "@dxos/node-std/assert";
+import { Trigger as Trigger8 } from "@dxos/async";
+import { Invitation as Invitation4 } from "@dxos/client";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { Keyring } from "@dxos/keyring";
-import { PublicKey as PublicKey8 } from "@dxos/keys";
-import { log as log14 } from "@dxos/log";
-import { trace as trace4 } from "@dxos/protocols";
+import { PublicKey as PublicKey9 } from "@dxos/keys";
+import { log as log16 } from "@dxos/log";
+import { trace as trace5 } from "@dxos/protocols";
 var ServiceContext = class {
   // prettier-ignore
   constructor(storage, networkManager, modelFactory) {
     this.storage = storage;
     this.networkManager = networkManager;
     this.modelFactory = modelFactory;
-    this.initialized = new Trigger7();
+    this.initialized = new Trigger8();
     this.dataServiceSubscriptions = new DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = PublicKey8.random().toHex();
+    this._instanceId = PublicKey9.random().toHex();
     networkManager._traceParent = this._instanceId;
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
     this.snapshotStore = new SnapshotStore(storage.createDirectory("snapshots"));
@@ -3620,13 +3734,13 @@ var ServiceContext = class {
     this.identityManager._traceParent = this._instanceId;
     this.invitations = new InvitationsHandler(this.networkManager);
     this.invitations._traceParent = this._instanceId;
-    this._handlerFactories.set(Invitation5.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
+    this._handlerFactories.set(Invitation4.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
       var _a;
       return (_a = this.identityManager.identity) != null ? _a : failUndefined2();
     }, this._acceptIdentity.bind(this)));
   }
   async open() {
-    log14.trace("dxos.sdk.service-context", trace4.begin({
+    log16.trace("dxos.sdk.service-context", trace5.begin({
       id: this._instanceId
     }), {
       file: "service-context.ts",
@@ -3634,7 +3748,7 @@ var ServiceContext = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    log14("opening...", {}, {
+    log16("opening...", {}, {
       file: "service-context.ts",
       line: 117,
       scope: this,
@@ -3646,7 +3760,7 @@ var ServiceContext = class {
     if (this.identityManager.identity) {
       await this._initialize();
     }
-    log14("opened", {}, {
+    log16("opened", {}, {
       file: "service-context.ts",
       line: 124,
       scope: this,
@@ -3655,7 +3769,7 @@ var ServiceContext = class {
   }
   async close() {
     var _a, _b;
-    log14("closing...", {}, {
+    log16("closing...", {}, {
       file: "service-context.ts",
       line: 128,
       scope: this,
@@ -3668,13 +3782,13 @@ var ServiceContext = class {
     await this.feedStore.close();
     await this.networkManager.close();
     this.dataServiceSubscriptions.clear();
-    log14("closed", {}, {
+    log16("closed", {}, {
       file: "service-context.ts",
       line: 136,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    log14.trace("dxos.sdk.service-context", trace4.end({
+    log16.trace("dxos.sdk.service-context", trace5.end({
       id: this._instanceId
     }), {
       file: "service-context.ts",
@@ -3690,7 +3804,7 @@ var ServiceContext = class {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    assert12(factory, `Unknown invitation kind: ${invitation.kind}`);
+    assert13(factory, `Unknown invitation kind: ${invitation.kind}`);
     return factory(invitation);
   }
   async _acceptIdentity(params) {
@@ -3701,7 +3815,7 @@ var ServiceContext = class {
   // Called when identity is created.
   async _initialize() {
     var _a;
-    log14("initializing spaces...", {}, {
+    log16("initializing spaces...", {}, {
       file: "service-context.ts",
       line: 163,
       scope: this,
@@ -3724,8 +3838,8 @@ var ServiceContext = class {
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.modelFactory, this.feedStore, this.snapshotStore);
     this.dataSpaceManager._traceParent = this._instanceId;
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(Invitation5.Kind.SPACE, (invitation) => {
-      assert12(this.dataSpaceManager, "dataSpaceManager not initialized yet");
+    this._handlerFactories.set(Invitation4.Kind.SPACE, (invitation) => {
+      assert13(this.dataSpaceManager, "dataSpaceManager not initialized yet");
       return new SpaceInvitationProtocol(this.dataSpaceManager, signingContext, this.keyring, invitation.spaceKey);
     });
     this.initialized.wake();
@@ -3739,7 +3853,7 @@ var ServiceContext = class {
           return;
         }
         if (!this.dataSpaceManager) {
-          log14("dataSpaceManager not initialized yet, ignoring space admission", {
+          log16("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
             file: "service-context.ts",
@@ -3750,7 +3864,7 @@ var ServiceContext = class {
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log14("space already exists, ignoring space admission", {
+          log16("space already exists, ignoring space admission", {
             details: assertion
           }, {
             file: "service-context.ts",
@@ -3761,7 +3875,7 @@ var ServiceContext = class {
           return;
         }
         try {
-          log14("accepting space recorded in halo", {
+          log16("accepting space recorded in halo", {
             details: assertion
           }, {
             file: "service-context.ts",
@@ -3774,7 +3888,7 @@ var ServiceContext = class {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log14.catch(err, {}, {
+          log16.catch(err, {}, {
             file: "service-context.ts",
             line: 220,
             scope: this,
@@ -3822,10 +3936,10 @@ var ClientServicesHost = class {
     // TODO(wittjosiah): Turn this on by default.
     lockKey
   } = {}) {
-    this._statusUpdate = new Event7();
+    this._statusUpdate = new Event8();
     this._opening = false;
     this._open = false;
-    this._instanceId = PublicKey9.random().toHex();
+    this._instanceId = PublicKey10.random().toHex();
     this._storage = storage;
     this._modelFactory = modelFactory;
     if (config) {
@@ -3879,16 +3993,16 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, networkManager }) {
-    assert13(!this._open, "service host is open");
+    assert14(!this._open, "service host is open");
     if (config) {
-      assert13(!this._config, "config already set");
+      assert14(!this._config, "config already set");
       this._config = config;
       if (!this._storage) {
         this._storage = createStorageObjects(config.get("runtime.client.storage", {})).storage;
       }
     }
     if (networkManager) {
-      assert13(!this._networkManager, "network manager already set");
+      assert14(!this._networkManager, "network manager already set");
       this._networkManager = networkManager;
     }
   }
@@ -3897,7 +4011,7 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    log15.trace("dxos.sdk.client-services-host", trace5.begin({
+    log17.trace("dxos.sdk.client-services-host", trace6.begin({
       id: this._instanceId
     }), {
       file: "service-host.ts",
@@ -3905,11 +4019,11 @@ var ClientServicesHost = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    assert13(this._config, "config not set");
-    assert13(this._storage, "storage not set");
-    assert13(this._networkManager, "network manager not set");
+    assert14(this._config, "config not set");
+    assert14(this._storage, "storage not set");
+    assert14(this._networkManager, "network manager not set");
     this._opening = true;
-    log15("opening...", {
+    log17("opening...", {
       lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
     }, {
       file: "service-host.ts",
@@ -3943,7 +4057,7 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = (_c = this._serviceContext.identityManager.identity) == null ? void 0 : _c.deviceKey;
-    log15("opened", {
+    log17("opened", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -3958,7 +4072,7 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    log15("closing...", {
+    log17("closing...", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -3972,7 +4086,7 @@ var ClientServicesHost = class {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    log15("closed", {
+    log17("closed", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -3980,7 +4094,7 @@ var ClientServicesHost = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    log15.trace("dxos.sdk.client-services-host", trace5.end({
+    log17.trace("dxos.sdk.client-services-host", trace6.end({
       id: this._instanceId
     }), {
       file: "service-host.ts",
@@ -3991,7 +4105,7 @@ var ClientServicesHost = class {
   }
   async reset() {
     var _a;
-    log15("resetting...", {}, {
+    log17("resetting...", {}, {
       file: "service-host.ts",
       line: 240,
       scope: this,
@@ -3999,7 +4113,7 @@ var ClientServicesHost = class {
     });
     await ((_a = this._serviceContext) == null ? void 0 : _a.close());
     await this._storage.reset();
-    log15("reset", {}, {
+    log17("reset", {}, {
       file: "service-host.ts",
       line: 243,
       scope: this,
@@ -4032,7 +4146,7 @@ var LocalClientServices = class {
 
 // packages/sdk/client-services/src/packlets/services/utils.ts
 import { Config } from "@dxos/config";
-import { log as log16 } from "@dxos/log";
+import { log as log18 } from "@dxos/log";
 import { MemorySignalManager as MemorySignalManager2, MemorySignalManagerContext as MemorySignalManagerContext2, WebsocketSignalManager as WebsocketSignalManager2 } from "@dxos/messaging";
 import { createWebRTCTransportFactory, MemoryTransportFactory, NetworkManager as NetworkManager2 } from "@dxos/network-manager";
 var fromHost = (config = new Config()) => {
@@ -4042,11 +4156,9 @@ var fromHost = (config = new Config()) => {
   });
 };
 var createNetworkManager = (config, options = {}) => {
-  const signalServer = config.get("runtime.services.signal.server");
-  if (signalServer) {
-    const { log: log1 = true, signalManager = new WebsocketSignalManager2([
-      signalServer
-    ]), transportFactory = createWebRTCTransportFactory({
+  const signals = config.get("runtime.services.signaling");
+  if (signals) {
+    const { log: log1 = true, signalManager = new WebsocketSignalManager2(signals), transportFactory = createWebRTCTransportFactory({
       iceServers: config.get("runtime.services.ice")
     }) } = options;
     return new NetworkManager2({
@@ -4055,7 +4167,7 @@ var createNetworkManager = (config, options = {}) => {
       transportFactory
     });
   }
-  log16.warn("P2P network is not configured.", {}, {
+  log18.warn("P2P network is not configured.", {}, {
     file: "utils.ts",
     line: 48,
     scope: void 0,
@@ -4105,7 +4217,7 @@ var IFrameHostRuntime = class {
         }
       ]
     });
-    this._ready = new Trigger8();
+    this._ready = new Trigger9();
     this._configProvider = configProvider;
     this._appPort = appPort;
     this._shellPort = shellPort;
@@ -4121,7 +4233,7 @@ var IFrameHostRuntime = class {
   }
   async start() {
     var _a;
-    log17("starting...", {}, {
+    log19("starting...", {}, {
       file: "iframe-host-runtime.ts",
       line: 75,
       scope: this,
@@ -4129,15 +4241,13 @@ var IFrameHostRuntime = class {
     });
     try {
       this._config = await getAsyncValue(this._configProvider);
-      const signalServer = this._config.get("runtime.services.signal.server");
+      const signals = this._config.get("runtime.services.signaling");
       this._clientServices = new LocalClientServices({
         lockKey: LOCK_KEY,
         config: this._config,
         networkManager: new NetworkManager3({
           log: true,
-          signalManager: signalServer ? new WebsocketSignalManager3([
-            signalServer
-          ]) : new MemorySignalManager3(new MemorySignalManagerContext3()),
+          signalManager: signals ? new WebsocketSignalManager3(signals) : new MemorySignalManager3(new MemorySignalManagerContext3()),
           transportFactory: this._transportFactory
         })
       });
@@ -4172,7 +4282,7 @@ var IFrameHostRuntime = class {
         (_a = this._shellRuntime) == null ? void 0 : _a.open()
       ]);
       this._ready.wake(void 0);
-      log17("started", {}, {
+      log19("started", {}, {
         file: "iframe-host-runtime.ts",
         line: 118,
         scope: this,
@@ -4180,7 +4290,7 @@ var IFrameHostRuntime = class {
       });
     } catch (err) {
       this._ready.wake(err);
-      log17.catch(err, {}, {
+      log19.catch(err, {}, {
         file: "iframe-host-runtime.ts",
         line: 121,
         scope: this,
@@ -4190,7 +4300,7 @@ var IFrameHostRuntime = class {
   }
   async stop() {
     var _a;
-    log17("stopping...", {}, {
+    log19("stopping...", {}, {
       file: "iframe-host-runtime.ts",
       line: 126,
       scope: this,
@@ -4199,7 +4309,7 @@ var IFrameHostRuntime = class {
     await this._clientRpc.close();
     await this._clientServices.close();
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
-    log17("stopped", {}, {
+    log19("stopped", {}, {
       file: "iframe-host-runtime.ts",
       line: 130,
       scope: this,
@@ -4245,4 +4355,4 @@ export {
   LocalClientServices,
   fromHost
 };
-//# sourceMappingURL=chunk-2DGNNQWS.mjs.map
+//# sourceMappingURL=chunk-LGMYP2WL.mjs.map