@dxos/echo-pipeline 0.8.4-main.dedc0f3 → 0.8.4-main.e00bdcdb52

package/dist/lib/{browser/chunk-I4JBIZSN.mjs → neutral/chunk-VIHYDCCC.mjs}

@@ -10,24 +10,8 @@ var valueEncoding = createCodecEncoding(codec);
 import { invariant } from "@dxos/invariant";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/common/feeds.ts";
 var createMappedFeedWriter = (mapper, writer) => {
-  invariant(mapper, void 0, {
-    F: __dxlog_file,
-    L: 16,
-    S: void 0,
-    A: [
-      "mapper",
-      ""
-    ]
-  });
-  invariant(writer, void 0, {
-    F: __dxlog_file,
-    L: 17,
-    S: void 0,
-    A: [
-      "writer",
-      ""
-    ]
-  });
+  invariant(mapper, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 8, S: void 0, A: ["mapper", ""] });
+  invariant(writer, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 9, S: void 0, A: ["writer", ""] });
   return {
     write: async (data, options) => await writer.write(await mapper(data), options)
   };
@@ -61,26 +45,13 @@ import { DataCorruptionError, STORAGE_VERSION } from "@dxos/protocols";
 import { schema as schema2 } from "@dxos/protocols/proto";
 import { Invitation, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap as ComplexMap2, arrayToBuffer, forEachAsync, isNonNullable } from "@dxos/util";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/metadata/metadata-store.ts";
 function _ts_decorate(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/metadata/metadata-store.ts";
 var EXPIRED_INVITATION_CLEANUP_INTERVAL = 60 * 60 * 1e3;
 var emptyEchoMetadata = () => ({
   version: STORAGE_VERSION,
@@ -92,6 +63,18 @@ var emptyLargeSpaceMetadata = () => ({});
 var EchoMetadata = schema2.getCodecForType("dxos.echo.metadata.EchoMetadata");
 var LargeSpaceMetadata = schema2.getCodecForType("dxos.echo.metadata.LargeSpaceMetadata");
 var MetadataStore = class {
+  _metadata = emptyEchoMetadata();
+  _spaceLargeMetadata = new ComplexMap2(PublicKey2.hash);
+  _metadataFile = void 0;
+  update = new Event();
+  _invitationCleanupCtx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 35 });
+  /**
+  * @internal
+  */
+  _directory;
+  constructor(directory) {
+    this._directory = directory;
+  }
   get metadata() {
     return this._metadata;
   }
@@ -117,22 +100,22 @@ var MetadataStore = class {
         size: dataSize,
         checksum,
         name: file.filename
-      }, {
-        F: __dxlog_file2,
-        L: 91,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 63, S: this });
       if (fileLength < dataSize + 8) {
-        throw new DataCorruptionError("Metadata size is smaller than expected.", {
-          fileLength,
-          dataSize
+        throw new DataCorruptionError({
+          message: "Metadata size is smaller than expected.",
+          context: {
+            fileLength,
+            dataSize
+          }
         });
       }
       const data = await file.read(8, dataSize);
       const calculatedChecksum = CRC32.buf(data);
       if (calculatedChecksum !== checksum) {
-        throw new DataCorruptionError("Metadata checksum is invalid.");
+        throw new DataCorruptionError({
+          message: "Metadata checksum is invalid."
+        });
       }
       return codec2.decode(data);
     } finally {
@@ -153,12 +136,7 @@ var MetadataStore = class {
     log("saved", {
       size: encoded.length,
       checksum
-    }, {
-      F: __dxlog_file2,
-      L: 126,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 100, S: this });
   }
   async close() {
     await this._invitationCleanupCtx.dispose();
@@ -181,18 +159,12 @@ var MetadataStore = class {
         this._metadata = metadata;
       }
       this._metadata.spaces?.forEach((space) => {
-        var _space;
-        (_space = space).state ?? (_space.state = SpaceState.SPACE_ACTIVE);
+        space.state ??= SpaceState.SPACE_ACTIVE;
       });
     } catch (err) {
       log.error("failed to load metadata", {
         err
-      }, {
-        F: __dxlog_file2,
-        L: 158,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 129, S: this });
       this._metadata = emptyEchoMetadata();
     }
     await forEachAsync([
@@ -204,12 +176,7 @@ var MetadataStore = class {
       } catch (err) {
         log.error("failed to load space large metadata", {
           err
-        }, {
-          F: __dxlog_file2,
-          L: 170,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 141, S: this });
       }
     });
     scheduleTaskInterval(this._invitationCleanupCtx, async () => {
@@ -241,12 +208,7 @@ var MetadataStore = class {
     } catch (err) {
       log.error("failed to load space large metadata", {
         err
-      }, {
-        F: __dxlog_file2,
-        L: 212,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 174, S: this });
     }
   }
   async _saveSpaceLargeMetadata(key) {
@@ -262,15 +224,7 @@ var MetadataStore = class {
       return this._metadata.identity.haloSpace;
     }
     const space = this.spaces.find((space2) => space2.key.equals(spaceKey));
-    invariant2(space, "Space not found", {
-      F: __dxlog_file2,
-      L: 234,
-      S: this,
-      A: [
-        "space",
-        "'Space not found'"
-      ]
-    });
+    invariant2(space, "Space not found", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 193, S: this, A: ["space", "'Space not found'"] });
     return space;
   }
   hasSpace(spaceKey) {
@@ -292,12 +246,7 @@ var MetadataStore = class {
   * Clears storage - doesn't work for now.
   */
   async clear() {
-    log("clearing all metadata", void 0, {
-      F: __dxlog_file2,
-      L: 262,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log("clearing all metadata", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 215, S: this });
     await this._directory.delete();
     this._metadata = emptyEchoMetadata();
   }
@@ -305,15 +254,7 @@ var MetadataStore = class {
     return this._metadata.identity;
   }
   async setIdentityRecord(record) {
-    invariant2(!this._metadata.identity, "Cannot overwrite existing identity in metadata", {
-      F: __dxlog_file2,
-      L: 272,
-      S: this,
-      A: [
-        "!this._metadata.identity",
-        "'Cannot overwrite existing identity in metadata'"
-      ]
-    });
+    invariant2(!this._metadata.identity, "Cannot overwrite existing identity in metadata", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 223, S: this, A: ["!this._metadata.identity", "'Cannot overwrite existing identity in metadata'"] });
     this._metadata.identity = record;
     await this._save();
     await this.flush();
@@ -322,11 +263,10 @@ var MetadataStore = class {
     return this._metadata.invitations ?? [];
   }
   async addInvitation(invitation) {
-    var _this__metadata;
     if (this._metadata.invitations?.find((i) => i.invitationId === invitation.invitationId)) {
       return;
     }
-    ((_this__metadata = this._metadata).invitations ?? (_this__metadata.invitations = [])).push(invitation);
+    (this._metadata.invitations ??= []).push(invitation);
     await this._save();
     await this.flush();
   }
@@ -336,17 +276,8 @@ var MetadataStore = class {
     await this.flush();
   }
   async addSpace(record) {
-    var _this__metadata;
-    invariant2(!(this._metadata.spaces ?? []).find((space) => space.key.equals(record.key)), "Cannot overwrite existing space in metadata", {
-      F: __dxlog_file2,
-      L: 300,
-      S: this,
-      A: [
-        "!(this._metadata.spaces ?? []).find((space) => space.key.equals(record.key))",
-        "'Cannot overwrite existing space in metadata'"
-      ]
-    });
-    ((_this__metadata = this._metadata).spaces ?? (_this__metadata.spaces = [])).push(record);
+    invariant2(!(this._metadata.spaces ?? []).find((space) => space.key.equals(record.key)), "Cannot overwrite existing space in metadata", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 245, S: this, A: ["!(this._metadata.spaces ?? []).find((space)=>space.key.equals(record.key))", "'Cannot overwrite existing space in metadata'"] });
+    (this._metadata.spaces ??= []).push(record);
     await this._save();
     await this.flush();
   }
@@ -391,18 +322,6 @@ var MetadataStore = class {
     await this._save();
     await this.flush();
   }
-  constructor(directory) {
-    _define_property(this, "_metadata", emptyEchoMetadata());
-    _define_property(this, "_spaceLargeMetadata", new ComplexMap2(PublicKey2.hash));
-    _define_property(this, "_metadataFile", void 0);
-    _define_property(this, "update", new Event());
-    _define_property(this, "_invitationCleanupCtx", new Context(void 0, {
-      F: __dxlog_file2,
-      L: 55
-    }));
-    _define_property(this, "_directory", void 0);
-    this._directory = directory;
-  }
 };
 _ts_decorate([
   synchronized
@@ -426,26 +345,13 @@ import { Event as Event2 } from "@dxos/async";
 import { timed } from "@dxos/debug";
 import { log as log2 } from "@dxos/log";
 import { Timeframe } from "@dxos/timeframe";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/timeframe-clock.ts";
 function _ts_decorate2(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/timeframe-clock.ts";
 var mapTimeframeToFeedIndexes = (timeframe) => timeframe.frames().map(([feedKey, index]) => ({
   feedKey,
   index
@@ -459,6 +365,13 @@ var startAfter = (timeframe) => timeframe.frames().map(([feedKey, index]) => ({
   index: index + 1
 }));
 var TimeframeClock = class {
+  _timeframe;
+  update = new Event2();
+  _pendingTimeframe;
+  constructor(_timeframe = new Timeframe()) {
+    this._timeframe = _timeframe;
+    this._pendingTimeframe = _timeframe;
+  }
   /**
   * Timeframe that was processed by ECHO.
   */
@@ -497,34 +410,16 @@ var TimeframeClock = class {
     log2("waitUntilReached", {
       target,
       current: this._timeframe
-    }, {
-      F: __dxlog_file3,
-      L: 70,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 69, S: this });
     await this.update.waitForCondition(() => {
       log2("check if reached", {
         target,
         current: this._timeframe,
         deps: Timeframe.dependencies(target, this._timeframe)
-      }, {
-        F: __dxlog_file3,
-        L: 72,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 74, S: this });
       return Timeframe.dependencies(target, this._timeframe).isEmpty();
     });
   }
-  constructor(_timeframe = new Timeframe()) {
-    _define_property2(this, "_timeframe", void 0);
-    _define_property2(this, "update", void 0);
-    _define_property2(this, "_pendingTimeframe", void 0);
-    this._timeframe = _timeframe;
-    this.update = new Event2();
-    this._pendingTimeframe = _timeframe;
-  }
 };
 _ts_decorate2([
   timed(5e3)
@@ -549,54 +444,55 @@ var createMessageSelector = (timeframeClock) => {
   return (messages) => {
     for (let i = 0; i < messages.length; i++) {
       const { data: { timeframe } } = messages[i];
-      invariant3(timeframe, void 0, {
-        F: __dxlog_file4,
-        L: 25,
-        S: void 0,
-        A: [
-          "timeframe",
-          ""
-        ]
-      });
+      invariant3(timeframe, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 16, S: void 0, A: ["timeframe", ""] });
       if (!timeframeClock.hasGaps(timeframe)) {
         return i;
       }
     }
-    log3("Skipping...", void 0, {
-      F: __dxlog_file4,
-      L: 33,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    log3("Skipping...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 22, S: void 0 });
   };
 };
 
 // src/pipeline/pipeline.ts
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts";
 function _ts_decorate3(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file5 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts";
 var PipelineState = class {
+  _feeds;
+  _timeframeClock;
+  /**
+  * @internal
+  */
+  _ctx = new Context2(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 29 });
   // TODO(dmaretskyi): Remove?. Avoid accessing `_timeframeClock` before constructor initialization.
   get timeframeUpdate() {
     return this._timeframeClock.update;
   }
+  stalled = new Event3();
+  /**
+  * @internal
+  */
+  _startTimeframe = new Timeframe2();
+  /**
+  * Target timeframe we are waiting to reach.
+  */
+  _targetTimeframe;
+  /**
+  * @internal
+  */
+  _reachedTargetPromise;
+  /**
+  * @internal
+  */
+  _reachedTarget = false;
+  constructor(_feeds, _timeframeClock) {
+    this._feeds = _feeds;
+    this._timeframeClock = _timeframeClock;
+  }
   /**
   * Latest theoretical timeframe based on the last mutation in each feed.
   * NOTE: This might never be reached if the mutation dependencies
@@ -639,28 +535,20 @@ var PipelineState = class {
   *
   * @param timeout Timeout in milliseconds to specify the maximum wait time.
   */
-  async waitUntilReachedTargetTimeframe({ ctx = new Context2(void 0, {
-    F: __dxlog_file5,
-    L: 132
-  }), timeout, breakOnStall = true } = {}) {
+  async waitUntilReachedTargetTimeframe({ ctx = new Context2(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 91 }), timeout, breakOnStall = true } = {}) {
     log4("waitUntilReachedTargetTimeframe", {
       timeout,
       current: this.timeframe,
       target: this.targetTimeframe
-    }, {
-      F: __dxlog_file5,
-      L: 136,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._reachedTargetPromise ?? (this._reachedTargetPromise = Promise.race([
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 92, S: this });
+    this._reachedTargetPromise ??= Promise.race([
       this._timeframeClock.update.waitForCondition(() => {
         return Timeframe2.dependencies(this.targetTimeframe, this.timeframe).isEmpty();
       }),
       ...breakOnStall ? [
         this.stalled.discardParameter().waitForCount(1)
       ] : []
-    ]));
+    ]);
     let done = false;
     if (timeout) {
       return Promise.race([
@@ -679,52 +567,37 @@ var PipelineState = class {
             current: this.timeframe,
             target: this.targetTimeframe,
             dependencies: Timeframe2.dependencies(this.targetTimeframe, this.timeframe)
-          }, {
-            F: __dxlog_file5,
-            L: 164,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 118, S: this });
         })
       ]);
     } else {
       return this._reachedTargetPromise;
     }
   }
-  constructor(_feeds, _timeframeClock) {
-    _define_property3(this, "_feeds", void 0);
-    _define_property3(this, "_timeframeClock", void 0);
-    _define_property3(this, "_ctx", void 0);
-    _define_property3(this, "stalled", void 0);
-    _define_property3(this, "_startTimeframe", void 0);
-    _define_property3(this, "_targetTimeframe", void 0);
-    _define_property3(this, "_reachedTargetPromise", void 0);
-    _define_property3(this, "_reachedTarget", void 0);
-    this._feeds = _feeds;
-    this._timeframeClock = _timeframeClock;
-    this._ctx = new Context2(void 0, {
-      F: __dxlog_file5,
-      L: 42
-    });
-    this.stalled = new Event3();
-    this._startTimeframe = new Timeframe2();
-    this._reachedTarget = false;
-  }
 };
 var Pipeline = class {
+  _timeframeClock = new TimeframeClock(new Timeframe2());
+  _feeds = new ComplexMap3(PublicKey3.hash);
+  // External state accessor.
+  _state = new PipelineState(this._feeds, this._timeframeClock);
+  // Waits for the message consumer to process the message and yield control back to the pipeline.
+  _processingTrigger = new Trigger().wake();
+  _pauseTrigger = new Trigger().wake();
+  // Pending downloads.
+  _downloads = new ComplexMap3((value) => PublicKey3.hash(value.key));
+  // Inbound feed stream.
+  _feedSetIterator;
+  // Outbound feed writer.
+  _writer;
+  _isStopping = false;
+  _isStarted = false;
+  _isBeingConsumed = false;
+  _isPaused = false;
   get state() {
     return this._state;
   }
   get writer() {
-    invariant4(this._writer, "Writer not set.", {
-      F: __dxlog_file5,
-      L: 246,
-      S: this,
-      A: [
-        "this._writer",
-        "'Writer not set.'"
-      ]
-    });
+    invariant4(this._writer, "Writer not set.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 184, S: this, A: ["this._writer", "'Writer not set.'"] });
     return this._writer;
   }
   hasFeed(feedKey) {
@@ -745,54 +618,20 @@ var Pipeline = class {
     }
   }
   setWriteFeed(feed) {
-    invariant4(!this._writer, "Writer already set.", {
-      F: __dxlog_file5,
-      L: 273,
-      S: this,
-      A: [
-        "!this._writer",
-        "'Writer already set.'"
-      ]
-    });
-    invariant4(feed.properties.writable, "Feed must be writable.", {
-      F: __dxlog_file5,
-      L: 274,
-      S: this,
-      A: [
-        "feed.properties.writable",
-        "'Feed must be writable.'"
-      ]
-    });
+    invariant4(!this._writer, "Writer already set.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 205, S: this, A: ["!this._writer", "'Writer already set.'"] });
+    invariant4(feed.properties.writable, "Feed must be writable.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 206, S: this, A: ["feed.properties.writable", "'Feed must be writable.'"] });
     this._writer = createMappedFeedWriter((payload) => ({
       timeframe: this._timeframeClock.timeframe,
       payload
     }), feed.createFeedWriter());
   }
   async start() {
-    invariant4(!this._isStarted, "Pipeline is already started.", {
-      F: __dxlog_file5,
-      L: 287,
-      S: this,
-      A: [
-        "!this._isStarted",
-        "'Pipeline is already started.'"
-      ]
-    });
-    log4("starting...", void 0, {
-      F: __dxlog_file5,
-      L: 288,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    invariant4(!this._isStarted, "Pipeline is already started.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 213, S: this, A: ["!this._isStarted", "'Pipeline is already started.'"] });
+    log4("starting...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 214, S: this });
     await this._initIterator();
     await this._feedSetIterator.open();
     this._isStarted = true;
-    log4("started", void 0, {
-      F: __dxlog_file5,
-      L: 292,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log4("started", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 218, S: this });
     if (!this._isPaused) {
       for (const feed of this._feeds.values()) {
         this._setFeedDownloadState(feed);
@@ -800,12 +639,7 @@ var Pipeline = class {
     }
   }
   async stop() {
-    log4("stopping...", void 0, {
-      F: __dxlog_file5,
-      L: 303,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log4("stopping...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 226, S: this });
     this._isStopping = true;
     for (const [feed, handle] of this._downloads.entries()) {
       feed.undownload(handle);
@@ -814,34 +648,18 @@ var Pipeline = class {
     await this._feedSetIterator?.close();
     await this._processingTrigger.wait();
     await this._state._ctx.dispose();
-    this._state._ctx = new Context2(void 0, {
-      F: __dxlog_file5,
-      L: 312
-    });
+    this._state._ctx = new Context2(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 235 });
     this._state._reachedTargetPromise = void 0;
     this._state._reachedTarget = false;
     this._isStarted = false;
-    log4("stopped", void 0, {
-      F: __dxlog_file5,
-      L: 316,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log4("stopped", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 239, S: this });
   }
   /**
   * @param timeframe Timeframe of already processed messages.
   *  The pipeline will start processing messages AFTER this timeframe.
   */
   async setCursor(timeframe) {
-    invariant4(!this._isStarted || this._isPaused, "Invalid state.", {
-      F: __dxlog_file5,
-      L: 325,
-      S: this,
-      A: [
-        "!this._isStarted || this._isPaused",
-        "'Invalid state.'"
-      ]
-    });
+    invariant4(!this._isStarted || this._isPaused, "Invalid state.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 245, S: this, A: ["!this._isStarted || this._isPaused", "'Invalid state.'"] });
     this._state._startTimeframe = timeframe;
     this._timeframeClock.setTimeframe(timeframe);
     if (this._feedSetIterator) {
@@ -862,15 +680,7 @@ var Pipeline = class {
     this._isPaused = true;
   }
   async unpause() {
-    invariant4(this._isPaused, "Pipeline is not paused.", {
-      F: __dxlog_file5,
-      L: 354,
-      S: this,
-      A: [
-        "this._isPaused",
-        "'Pipeline is not paused.'"
-      ]
-    });
+    invariant4(this._isPaused, "Pipeline is not paused.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 266, S: this, A: ["this._isPaused", "'Pipeline is not paused.'"] });
     this._pauseTrigger.wake();
     this._isPaused = false;
     for (const feed of this._feeds.values()) {
@@ -882,39 +692,15 @@ var Pipeline = class {
   * Updates the timeframe clock after the message has bee processed.
   */
   async *consume() {
-    invariant4(!this._isBeingConsumed, "Pipeline is already being consumed.", {
-      F: __dxlog_file5,
-      L: 369,
-      S: this,
-      A: [
-        "!this._isBeingConsumed",
-        "'Pipeline is already being consumed.'"
-      ]
-    });
+    invariant4(!this._isBeingConsumed, "Pipeline is already being consumed.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 277, S: this, A: ["!this._isBeingConsumed", "'Pipeline is already being consumed.'"] });
     this._isBeingConsumed = true;
-    invariant4(this._feedSetIterator, "Iterator not initialized.", {
-      F: __dxlog_file5,
-      L: 372,
-      S: this,
-      A: [
-        "this._feedSetIterator",
-        "'Iterator not initialized.'"
-      ]
-    });
+    invariant4(this._feedSetIterator, "Iterator not initialized.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 279, S: this, A: ["this._feedSetIterator", "'Iterator not initialized.'"] });
     let lastFeedSetIterator = this._feedSetIterator;
     let iterable = lastFeedSetIterator[Symbol.asyncIterator]();
     while (!this._isStopping) {
       await this._pauseTrigger.wait();
       if (lastFeedSetIterator !== this._feedSetIterator) {
-        invariant4(this._feedSetIterator, "Iterator not initialized.", {
-          F: __dxlog_file5,
-          L: 381,
-          S: this,
-          A: [
-            "this._feedSetIterator",
-            "'Iterator not initialized.'"
-          ]
-        });
+        invariant4(this._feedSetIterator, "Iterator not initialized.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 286, S: this, A: ["this._feedSetIterator", "'Iterator not initialized.'"] });
         lastFeedSetIterator = this._feedSetIterator;
         iterable = lastFeedSetIterator[Symbol.asyncIterator]();
       }
@@ -941,12 +727,7 @@ var Pipeline = class {
       feed: feed.key.truncate(),
       seq,
       length: feed.length
-    }, {
-      F: __dxlog_file5,
-      L: 410,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 311, S: this });
     handle = feed.download({
       start: seq + 1,
       linear: true
@@ -955,12 +736,7 @@ var Pipeline = class {
       } else {
         log4("downloaded", {
           data
-        }, {
-          F: __dxlog_file5,
-          L: 415,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 323, S: this });
       }
     });
     this._downloads.set(feed, handle);
@@ -974,32 +750,13 @@ var Pipeline = class {
       log4.warn(`Stalled after ${iterator.options.stallTimeout}ms with ${iterator.size} feeds.`, {
         currentTimeframe: this._timeframeClock.timeframe,
         targetTimeframe: this._state.targetTimeframe
-      }, {
-        F: __dxlog_file5,
-        L: 429,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 336, S: this });
       this._state.stalled.emit();
     });
     for (const feed of this._feeds.values()) {
       await this._feedSetIterator.addFeed(feed);
     }
   }
-  constructor() {
-    _define_property3(this, "_timeframeClock", new TimeframeClock(new Timeframe2()));
-    _define_property3(this, "_feeds", new ComplexMap3(PublicKey3.hash));
-    _define_property3(this, "_state", new PipelineState(this._feeds, this._timeframeClock));
-    _define_property3(this, "_processingTrigger", new Trigger().wake());
-    _define_property3(this, "_pauseTrigger", new Trigger().wake());
-    _define_property3(this, "_downloads", new ComplexMap3((value) => PublicKey3.hash(value.key)));
-    _define_property3(this, "_feedSetIterator", void 0);
-    _define_property3(this, "_writer", void 0);
-    _define_property3(this, "_isStopping", false);
-    _define_property3(this, "_isStarted", false);
-    _define_property3(this, "_isBeingConsumed", false);
-    _define_property3(this, "_isPaused", false);
-  }
 };
 _ts_decorate3([
   synchronized2
@@ -1025,27 +782,31 @@ import { invariant as invariant5 } from "@dxos/invariant";
 import { log as log5 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols/proto";
 import { RpcExtension } from "@dxos/teleport";
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/auth.ts";
 var AuthExtension = class extends RpcExtension {
+  _authProps;
+  _ctx = new Context3({
+    onError: (err) => {
+      log5.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 15, S: this });
+    }
+  }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 13 });
+  constructor(_authProps) {
+    super({
+      requested: {
+        AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
+      },
+      exposed: {
+        AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
+      },
+      timeout: 60 * 1e3
+    }), this._authProps = _authProps;
+  }
   async getHandlers() {
     return {
       AuthService: {
         authenticate: async ({ challenge }) => {
           try {
-            const credential = await this._authParams.provider(challenge);
+            const credential = await this._authProps.provider(challenge);
             if (!credential) {
               throw new Error("auth rejected");
             }
@@ -1053,12 +814,7 @@ var AuthExtension = class extends RpcExtension {
               credential
             };
           } catch (err) {
-            log5.error("failed to generate auth credentials", err, {
-              F: __dxlog_file6,
-              L: 55,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+            log5.error("failed to generate auth credentials", err, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 42, S: this });
             throw new Error("auth rejected");
           }
         }
@@ -1073,35 +829,14 @@ var AuthExtension = class extends RpcExtension {
         const { credential } = await this.rpc.AuthService.authenticate({
           challenge
         });
-        invariant5(credential?.length > 0, "invalid credential", {
-          F: __dxlog_file6,
-          L: 69,
-          S: this,
-          A: [
-            "credential?.length > 0",
-            "'invalid credential'"
-          ]
-        });
-        const success = await this._authParams.verifier(challenge, credential);
-        invariant5(success, "credential not verified", {
-          F: __dxlog_file6,
-          L: 71,
-          S: this,
-          A: [
-            "success",
-            "'credential not verified'"
-          ]
-        });
-        runInContext(this._ctx, () => this._authParams.onAuthSuccess());
+        invariant5(credential?.length > 0, "invalid credential", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 57, S: this, A: ["credential?.length > 0", "'invalid credential'"] });
+        const success = await this._authProps.verifier(challenge, credential);
+        invariant5(success, "credential not verified", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 59, S: this, A: ["success", "'credential not verified'"] });
+        runInContext(this._ctx, () => this._authProps.onAuthSuccess());
       } catch (err) {
-        log5("auth failed", err, {
-          F: __dxlog_file6,
-          L: 74,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log5("auth failed", err, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 62, S: this });
         this.close();
-        this._authParams.onAuthFailure();
+        this._authProps.onAuthFailure();
       }
     });
   }
@@ -1113,29 +848,6 @@ var AuthExtension = class extends RpcExtension {
     await this._ctx.dispose();
     await super.onAbort();
   }
-  constructor(_authParams) {
-    super({
-      requested: {
-        AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
-      },
-      exposed: {
-        AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
-      },
-      timeout: 60 * 1e3
-    }), _define_property4(this, "_authParams", void 0), _define_property4(this, "_ctx", void 0), this._authParams = _authParams, this._ctx = new Context3({
-      onError: (err) => {
-        log5.catch(err, void 0, {
-          F: __dxlog_file6,
-          L: 28,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    }, {
-      F: __dxlog_file6,
-      L: 26
-    });
-  }
 };
 
 // src/space/space.ts
@@ -1157,30 +869,67 @@ import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 import { TimeSeriesCounter, TimeUsageCounter, trace } from "@dxos/tracing";
 import { Callback, tracer } from "@dxos/util";
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/control-pipeline.ts";
 function _ts_decorate4(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/control-pipeline.ts";
 var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL = 500;
 var CONTROL_PIPELINE_SNAPSHOT_DELAY = 1e4;
 var USE_SNAPSHOTS = true;
 var ControlPipeline = class {
+  _ctx = new Context4(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 24 });
+  _pipeline;
+  _spaceStateMachine;
+  _spaceKey;
+  _metadata;
+  _targetTimeframe;
+  _lastTimeframeSaveTime = Date.now();
+  onFeedAdmitted = new Callback();
+  onMemberRoleChanged;
+  onCredentialProcessed;
+  onDelegatedInvitation;
+  onDelegatedInvitationRemoved;
+  _usage = new TimeUsageCounter();
+  _mutations = new TimeSeriesCounter();
+  _snapshotTask = new DeferredTask(this._ctx, async () => {
+    await sleepWithContext2(this._ctx, CONTROL_PIPELINE_SNAPSHOT_DELAY);
+    await this._saveSnapshot();
+  });
+  constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
+    this._spaceKey = spaceKey;
+    this._metadata = metadataStore;
+    this._pipeline = new Pipeline();
+    void this._pipeline.addFeed(genesisFeed);
+    this._spaceStateMachine = new SpaceStateMachine(spaceKey);
+    this._spaceStateMachine.onFeedAdmitted.set(async (info) => {
+      log6("feed admitted", {
+        key: info.key
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 50, S: this });
+      if (info.assertion.designation === AdmittedFeed.Designation.CONTROL && !info.key.equals(genesisFeed.key)) {
+        scheduleMicroTask(this._ctx, async () => {
+          try {
+            const feed = await feedProvider(info.key);
+            if (this._ctx.disposed) {
+              return;
+            }
+            if (!this._pipeline.hasFeed(feed.key)) {
+              await this._pipeline.addFeed(feed);
+            }
+          } catch (err) {
+            log6.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 65, S: this });
+          }
+        });
+      }
+      await this.onFeedAdmitted.callIfSet(info);
+    });
+    this.onMemberRoleChanged = this._spaceStateMachine.onMemberRoleChanged;
+    this.onCredentialProcessed = this._spaceStateMachine.onCredentialProcessed;
+    this.onDelegatedInvitation = this._spaceStateMachine.onDelegatedInvitation;
+    this.onDelegatedInvitationRemoved = this._spaceStateMachine.onDelegatedInvitationRemoved;
+  }
   get spaceState() {
     return this._spaceStateMachine;
   }
@@ -1191,40 +940,22 @@ var ControlPipeline = class {
     await this._pipeline.addFeed(feed);
     this._pipeline.setWriteFeed(feed);
   }
-  async start() {
+  async start(ctx) {
     const snapshot = this._metadata.getSpaceControlPipelineSnapshot(this._spaceKey);
     log6("load snapshot", {
       key: this._spaceKey,
       present: !!snapshot,
       tf: snapshot?.timeframe
-    }, {
-      F: __dxlog_file7,
-      L: 126,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 88, S: this });
     if (USE_SNAPSHOTS && snapshot) {
       await this._processSnapshot(snapshot);
     }
-    log6("starting...", void 0, {
-      F: __dxlog_file7,
-      L: 131,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log6("starting...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 96, S: this });
     setTimeout(async () => {
-      void this._consumePipeline(new Context4(void 0, {
-        F: __dxlog_file7,
-        L: 133
-      }));
+      void this._consumePipeline(ctx);
     });
     await this._pipeline.start();
-    log6("started", void 0, {
-      F: __dxlog_file7,
-      L: 137,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log6("started", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 101, S: this });
   }
   async _processSnapshot(snapshot) {
     await this._pipeline.setCursor(snapshot.timeframe);
@@ -1236,12 +967,7 @@ var ControlPipeline = class {
       if (!result) {
         log6.warn("credential processing failed from snapshot", {
           message
-        }, {
-          F: __dxlog_file7,
-          L: 150,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 111, S: this });
       }
     }
   }
@@ -1258,12 +984,7 @@ var ControlPipeline = class {
     log6("save snapshot", {
       key: this._spaceKey,
       snapshot: getSnapshotLoggerContext(snapshot)
-    }, {
-      F: __dxlog_file7,
-      L: 166,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 127, S: this });
     await this._metadata.setSpaceControlPipelineSnapshot(this._spaceKey, snapshot);
   }
   async _consumePipeline(ctx) {
@@ -1273,12 +994,7 @@ var ControlPipeline = class {
       try {
         await this._processMessage(ctx, msg);
       } catch (err) {
-        log6.catch(err, void 0, {
-          F: __dxlog_file7,
-          L: 179,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log6.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 140, S: this });
       }
       span.end();
     }
@@ -1287,12 +1003,7 @@ var ControlPipeline = class {
     log6("processing", {
       key: msg.feedKey,
       seq: msg.seq
-    }, {
-      F: __dxlog_file7,
-      L: 188,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 146, S: this });
     if (msg.data.payload.credential) {
       const timer = tracer.mark("dxos.echo.pipeline.control");
       const result = await this._spaceStateMachine.process(msg.data.payload.credential.credential, {
@@ -1302,12 +1013,7 @@ var ControlPipeline = class {
       if (!result) {
         log6.warn("processing failed", {
           msg
-        }, {
-          F: __dxlog_file7,
-          L: 197,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 157, S: this });
       } else {
         await this._noteTargetStateIfNeeded(this._pipeline.state.pendingTimeframe);
       }
@@ -1321,21 +1027,11 @@ var ControlPipeline = class {
     }
   }
   async stop() {
-    log6("stopping...", void 0, {
-      F: __dxlog_file7,
-      L: 217,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log6("stopping...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 174, S: this });
     await this._ctx.dispose();
     await this._pipeline.stop();
     await this._saveTargetTimeframe(this._pipeline.state.timeframe);
-    log6("stopped", void 0, {
-      F: __dxlog_file7,
-      L: 221,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log6("stopped", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 178, S: this });
   }
   async _saveTargetTimeframe(timeframe) {
     try {
@@ -1343,78 +1039,15 @@ var ControlPipeline = class {
       await this._metadata.setSpaceControlLatestTimeframe(this._spaceKey, newTimeframe);
       this._targetTimeframe = newTimeframe;
     } catch (err) {
-      log6(err, void 0, {
-        F: __dxlog_file7,
-        L: 230,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log6(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 186, S: this });
     }
   }
-  constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
-    _define_property5(this, "_ctx", new Context4(void 0, {
-      F: __dxlog_file7,
-      L: 47
-    }));
-    _define_property5(this, "_pipeline", void 0);
-    _define_property5(this, "_spaceStateMachine", void 0);
-    _define_property5(this, "_spaceKey", void 0);
-    _define_property5(this, "_metadata", void 0);
-    _define_property5(this, "_targetTimeframe", void 0);
-    _define_property5(this, "_lastTimeframeSaveTime", Date.now());
-    _define_property5(this, "onFeedAdmitted", new Callback());
-    _define_property5(this, "onMemberRoleChanged", void 0);
-    _define_property5(this, "onCredentialProcessed", void 0);
-    _define_property5(this, "onDelegatedInvitation", void 0);
-    _define_property5(this, "onDelegatedInvitationRemoved", void 0);
-    _define_property5(this, "_usage", new TimeUsageCounter());
-    _define_property5(this, "_mutations", new TimeSeriesCounter());
-    _define_property5(this, "_snapshotTask", new DeferredTask(this._ctx, async () => {
-      await sleepWithContext2(this._ctx, CONTROL_PIPELINE_SNAPSHOT_DELAY);
-      await this._saveSnapshot();
-    }));
-    this._spaceKey = spaceKey;
-    this._metadata = metadataStore;
-    this._pipeline = new Pipeline();
-    void this._pipeline.addFeed(genesisFeed);
-    this._spaceStateMachine = new SpaceStateMachine(spaceKey);
-    this._spaceStateMachine.onFeedAdmitted.set(async (info) => {
-      log6("feed admitted", {
-        key: info.key
-      }, {
-        F: __dxlog_file7,
-        L: 82,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      if (info.assertion.designation === AdmittedFeed.Designation.CONTROL && !info.key.equals(genesisFeed.key)) {
-        scheduleMicroTask(this._ctx, async () => {
-          try {
-            const feed = await feedProvider(info.key);
-            if (this._ctx.disposed) {
-              return;
-            }
-            if (!this._pipeline.hasFeed(feed.key)) {
-              await this._pipeline.addFeed(feed);
-            }
-          } catch (err) {
-            log6.catch(err, void 0, {
-              F: __dxlog_file7,
-              L: 96,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-        });
-      }
-      await this.onFeedAdmitted.callIfSet(info);
-    });
-    this.onMemberRoleChanged = this._spaceStateMachine.onMemberRoleChanged;
-    this.onCredentialProcessed = this._spaceStateMachine.onCredentialProcessed;
-    this.onDelegatedInvitation = this._spaceStateMachine.onDelegatedInvitation;
-    this.onDelegatedInvitationRemoved = this._spaceStateMachine.onDelegatedInvitationRemoved;
-  }
 };
+_ts_decorate4([
+  trace.info({
+    spanAttribute: true
+  })
+], ControlPipeline.prototype, "_spaceKey", void 0);
 _ts_decorate4([
   trace.metricsCounter()
 ], ControlPipeline.prototype, "_usage", void 0);
@@ -1423,14 +1056,15 @@ _ts_decorate4([
 ], ControlPipeline.prototype, "_mutations", void 0);
 _ts_decorate4([
   trace.span({
-    showInBrowserTimeline: true
+    showInBrowserTimeline: true,
+    op: "lifecycle"
   })
 ], ControlPipeline.prototype, "start", null);
 _ts_decorate4([
-  trace.span()
-], ControlPipeline.prototype, "_consumePipeline", null);
-_ts_decorate4([
-  trace.span()
+  trace.span({
+    showInBrowserTimeline: true,
+    showInRemoteTracing: false
+  })
 ], ControlPipeline.prototype, "_processMessage", null);
 ControlPipeline = _ts_decorate4([
   trace.resource(),
@@ -1450,141 +1084,27 @@ var getSnapshotLoggerContext = (snapshot) => {
 };
 
 // src/space/space.ts
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space.ts";
 function _ts_decorate5(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space.ts";
 var Space = class extends Resource {
-  get id() {
-    return this._id;
-  }
-  get key() {
-    return this._key;
-  }
-  get genesisFeedKey() {
-    return this._genesisFeedKey;
-  }
-  get controlFeedKey() {
-    return this._controlFeed?.key;
-  }
-  get dataFeedKey() {
-    return this._dataFeed?.key;
-  }
-  get spaceState() {
-    return this._controlPipeline.spaceState;
-  }
-  /**
-  * @test-only
-  */
-  get controlPipeline() {
-    return this._controlPipeline.pipeline;
-  }
-  async setControlFeed(feed) {
-    invariant6(!this._controlFeed, "Control feed already set.", {
-      F: __dxlog_file8,
-      L: 156,
-      S: this,
-      A: [
-        "!this._controlFeed",
-        "'Control feed already set.'"
-      ]
-    });
-    this._controlFeed = feed;
-    await this._controlPipeline.setWriteFeed(feed);
-    return this;
-  }
-  async setDataFeed(feed) {
-    invariant6(!this._dataFeed, "Data feed already set.", {
-      F: __dxlog_file8,
-      L: 163,
-      S: this,
-      A: [
-        "!this._dataFeed",
-        "'Data feed already set.'"
-      ]
-    });
-    this._dataFeed = feed;
-    return this;
-  }
-  /**
-  * Use for diagnostics.
-  */
-  getControlFeeds() {
-    return Array.from(this._controlPipeline.spaceState.feeds.values());
-  }
-  async _open(ctx) {
-    log7("opening...", void 0, {
-      F: __dxlog_file8,
-      L: 177,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._controlPipeline.start();
-    log7("opened", void 0, {
-      F: __dxlog_file8,
-      L: 182,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-  async startProtocol() {
-    invariant6(this.isOpen, void 0, {
-      F: __dxlog_file8,
-      L: 187,
-      S: this,
-      A: [
-        "this.isOpen",
-        ""
-      ]
-    });
-    await this.protocol.start();
-    await this.protocol.addFeed(await this._feedProvider(this._genesisFeedKey));
-  }
-  async _close() {
-    log7("closing...", {
-      key: this._key
-    }, {
-      F: __dxlog_file8,
-      L: 194,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this.protocol.stop();
-    await this._controlPipeline.stop();
-    log7("closed", void 0, {
-      F: __dxlog_file8,
-      L: 200,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
+  onCredentialProcessed = new Callback2();
+  stateUpdate = new Event4();
+  protocol;
+  _id;
+  _key;
+  _genesisFeedKey;
+  _feedProvider;
+  _controlPipeline;
+  _controlFeed;
+  _dataFeed;
   constructor(params) {
-    super(), _define_property6(this, "onCredentialProcessed", new Callback2()), _define_property6(this, "stateUpdate", new Event4()), _define_property6(this, "protocol", void 0), _define_property6(this, "_id", void 0), _define_property6(this, "_key", void 0), _define_property6(this, "_genesisFeedKey", void 0), _define_property6(this, "_feedProvider", void 0), _define_property6(this, "_controlPipeline", void 0), _define_property6(this, "_controlFeed", void 0), _define_property6(this, "_dataFeed", void 0);
-    invariant6(params.spaceKey && params.feedProvider, void 0, {
-      F: __dxlog_file8,
-      L: 73,
-      S: this,
-      A: [
-        "params.spaceKey && params.feedProvider",
-        ""
-      ]
-    });
+    super();
+    invariant6(params.spaceKey && params.feedProvider, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 31, S: this, A: ["params.spaceKey && params.feedProvider", ""] });
     this._id = params.id;
     this._key = params.spaceKey;
     this._genesisFeedKey = params.genesisFeed.key;
@@ -1609,34 +1129,19 @@ var Space = class extends Resource {
       await this.onCredentialProcessed.callIfSet(credential);
       log7("onCredentialProcessed", {
         credential
-      }, {
-        F: __dxlog_file8,
-        L: 100,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 56, S: this });
       this.stateUpdate.emit();
     });
     this._controlPipeline.onDelegatedInvitation.set(async (invitation) => {
       log7("onDelegatedInvitation", {
         invitation
-      }, {
-        F: __dxlog_file8,
-        L: 104,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 62, S: this });
       await params.onDelegatedInvitationStatusChange(invitation, true);
     });
     this._controlPipeline.onDelegatedInvitationRemoved.set(async (invitation) => {
       log7("onDelegatedInvitationRemoved", {
         invitation
-      }, {
-        F: __dxlog_file8,
-        L: 108,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 68, S: this });
       await params.onDelegatedInvitationStatusChange(invitation, false);
     });
     this._controlPipeline.onMemberRoleChanged.set(async (changedMembers) => {
@@ -1645,16 +1150,70 @@ var Space = class extends Resource {
           m.key,
           m.role
         ])
-      }), {
-        F: __dxlog_file8,
-        L: 112,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }), { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 74, S: this });
       await params.onMemberRolesChanged(changedMembers);
     });
     this.protocol = params.protocol;
   }
+  get id() {
+    return this._id;
+  }
+  get key() {
+    return this._key;
+  }
+  get genesisFeedKey() {
+    return this._genesisFeedKey;
+  }
+  get controlFeedKey() {
+    return this._controlFeed?.key;
+  }
+  get dataFeedKey() {
+    return this._dataFeed?.key;
+  }
+  get spaceState() {
+    return this._controlPipeline.spaceState;
+  }
+  /**
+  * @test-only
+  */
+  get controlPipeline() {
+    return this._controlPipeline.pipeline;
+  }
+  async setControlFeed(feed) {
+    invariant6(!this._controlFeed, "Control feed already set.", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 109, S: this, A: ["!this._controlFeed", "'Control feed already set.'"] });
+    this._controlFeed = feed;
+    await this._controlPipeline.setWriteFeed(feed);
+    return this;
+  }
+  async setDataFeed(feed) {
+    invariant6(!this._dataFeed, "Data feed already set.", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 115, S: this, A: ["!this._dataFeed", "'Data feed already set.'"] });
+    this._dataFeed = feed;
+    return this;
+  }
+  /**
+  * Use for diagnostics.
+  */
+  getControlFeeds() {
+    return Array.from(this._controlPipeline.spaceState.feeds.values());
+  }
+  async _open(ctx) {
+    log7("opening...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 125, S: this });
+    await this._controlPipeline.start(ctx);
+    log7("opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 128, S: this });
+  }
+  async startProtocol(ctx) {
+    invariant6(this.isOpen, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 131, S: this, A: ["this.isOpen", ""] });
+    await this.protocol.start(ctx);
+    await this.protocol.addFeed(await this._feedProvider(this._genesisFeedKey));
+  }
+  async _close(ctx) {
+    log7("closing...", {
+      key: this._key
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 136, S: this });
+    await this.protocol.stop(ctx);
+    await this._controlPipeline.stop();
+    log7("closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 142, S: this });
+  }
 };
 _ts_decorate5([
   trace2.info()
@@ -1671,7 +1230,9 @@ _ts_decorate5([
   trace2.info()
 ], Space.prototype, "key", null);
 _ts_decorate5([
-  trace2.span()
+  trace2.span({
+    op: "lifecycle"
+  })
 ], Space.prototype, "_open", null);
 _ts_decorate5([
   synchronized3
@@ -1690,21 +1251,18 @@ import { Context as Context5 } from "@dxos/context";
 import { ProtocolError } from "@dxos/protocols";
 import { schema as schema4 } from "@dxos/protocols/proto";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
-function _define_property7(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/admission-discovery-extension.ts";
 var CredentialRetrieverExtension = class extends RpcExtension2 {
+  _request;
+  _onResult;
+  _ctx = new Context5(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 14 });
+  constructor(_request, _onResult) {
+    super({
+      requested: {
+        AdmissionDiscoveryService: schema4.getService("dxos.mesh.teleport.AdmissionDiscoveryService")
+      }
+    }), this._request = _request, this._onResult = _onResult;
+  }
   async getHandlers() {
     return {};
   }
@@ -1725,25 +1283,28 @@ var CredentialRetrieverExtension = class extends RpcExtension2 {
   async onAbort() {
     await this._ctx.dispose();
   }
-  constructor(_request, _onResult) {
+};
+var CredentialServerExtension = class extends RpcExtension2 {
+  _space;
+  constructor(_space) {
     super({
-      requested: {
+      exposed: {
         AdmissionDiscoveryService: schema4.getService("dxos.mesh.teleport.AdmissionDiscoveryService")
       }
-    }), _define_property7(this, "_request", void 0), _define_property7(this, "_onResult", void 0), _define_property7(this, "_ctx", void 0), this._request = _request, this._onResult = _onResult, this._ctx = new Context5(void 0, {
-      F: __dxlog_file9,
-      L: 26
-    });
+    }), this._space = _space;
   }
-};
-var CredentialServerExtension = class extends RpcExtension2 {
   async getHandlers() {
     return {
       AdmissionDiscoveryService: {
         getAdmissionCredential: async (request) => {
           const memberInfo = this._space.spaceState.members.get(request.memberKey);
           if (!memberInfo?.credential) {
-            throw new ProtocolError("Space member not found.", request);
+            throw new ProtocolError({
+              message: "Space member not found.",
+              context: {
+                ...request
+              }
+            });
           }
           return {
             admissionCredential: memberInfo.credential
@@ -1752,13 +1313,6 @@ var CredentialServerExtension = class extends RpcExtension2 {
       }
     };
   }
-  constructor(_space) {
-    super({
-      exposed: {
-        AdmissionDiscoveryService: schema4.getService("dxos.mesh.teleport.AdmissionDiscoveryService")
-      }
-    }), _define_property7(this, "_space", void 0), this._space = _space;
-  }
 };
 
 // src/space/space-protocol.ts
@@ -1771,29 +1325,34 @@ import { BlobSync } from "@dxos/teleport-extension-object-sync";
 import { ReplicatorExtension } from "@dxos/teleport-extension-replicator";
 import { trace as trace3 } from "@dxos/tracing";
 import { CallbackCollection, ComplexMap as ComplexMap4 } from "@dxos/util";
-function _define_property8(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-protocol.ts";
 function _ts_decorate6(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-protocol.ts";
 var MOCK_AUTH_PROVIDER = async (nonce) => Buffer.from("mock");
 var MOCK_AUTH_VERIFIER = async (nonce, credential) => true;
 var SpaceProtocol = class {
+  _networkManager;
+  _swarmIdentity;
+  _onSessionAuth;
+  _onAuthFailure;
+  blobSync;
+  _disableP2pReplication;
+  _topic;
+  _spaceKey;
+  _feeds = /* @__PURE__ */ new Set();
+  _sessions = new ComplexMap4(PublicKey5.hash);
+  // TODO(burdon): Move to config (with sensible defaults).
+  _topology = new MMSTTopology({
+    originateConnections: 4,
+    maxPeers: 10,
+    sampleSize: 20
+  });
+  _connection;
+  feedAdded = new CallbackCollection();
   get sessions() {
     return this._sessions;
   }
@@ -1803,16 +1362,23 @@ var SpaceProtocol = class {
   get _ownPeerKey() {
     return this._swarmIdentity.peerKey;
   }
+  constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }) {
+    this._spaceKey = topic;
+    this._networkManager = networkManager;
+    this._swarmIdentity = swarmIdentity;
+    this._onSessionAuth = onSessionAuth;
+    this._onAuthFailure = onAuthFailure;
+    this.blobSync = new BlobSync({
+      blobStore
+    });
+    this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
+    this._disableP2pReplication = disableP2pReplication ?? false;
+  }
   // TODO(burdon): Create abstraction for Space (e.g., add keys and have provider).
   async addFeed(feed) {
     log8("addFeed", {
       key: feed.key
-    }, {
-      F: __dxlog_file10,
-      L: 131,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 65, S: this });
     this._feeds.add(feed);
     for (const session of this._sessions.values()) {
       session.replicator.addFeed(feed);
@@ -1820,99 +1386,50 @@ var SpaceProtocol = class {
     await this.feedAdded.callSerial(feed);
   }
   // TODO(burdon): Rename open? Common open/close interfaces for all services?
-  async start() {
+  async start(ctx) {
     if (this._connection) {
       return;
     }
     const credentials = await this._swarmIdentity.credentialProvider(Buffer.from(""));
     await this.blobSync.open();
-    log8("starting...", void 0, {
-      F: __dxlog_file10,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log8("starting...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 82, S: this });
     const topic = await this._topic;
-    this._connection = await this._networkManager.joinSwarm({
+    this._connection = await this._networkManager.joinSwarm(ctx, {
       protocolProvider: this._createProtocolProvider(credentials),
       topic,
       topology: this._topology,
       label: `swarm ${topic.truncate()} for space ${this._spaceKey.truncate()}`
     });
-    log8("started", void 0, {
-      F: __dxlog_file10,
-      L: 161,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log8("started", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 90, S: this });
   }
   updateTopology() {
     this._topology.forceUpdate();
   }
-  async stop() {
+  async stop(ctx) {
     await this.blobSync.close();
     if (this._connection) {
-      log8("stopping...", void 0, {
-        F: __dxlog_file10,
-        L: 172,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._connection.close();
-      log8("stopped", void 0, {
-        F: __dxlog_file10,
-        L: 174,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log8("stopping...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 98, S: this });
+      await this._connection.close(ctx);
+      log8("stopped", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 100, S: this });
     }
   }
   _createProtocolProvider(credentials) {
-    return (wireParams) => {
+    return (wireProps) => {
       const session = new SpaceProtocolSession({
-        wireParams,
+        wireProps,
         swarmIdentity: this._swarmIdentity,
         onSessionAuth: this._onSessionAuth,
         onAuthFailure: this._onAuthFailure,
         blobSync: this.blobSync,
         disableP2pReplication: this._disableP2pReplication
       });
-      this._sessions.set(wireParams.remotePeerId, session);
+      this._sessions.set(wireProps.remotePeerId, session);
       for (const feed of this._feeds) {
         session.replicator.addFeed(feed);
       }
       return session;
     };
   }
-  constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }) {
-    _define_property8(this, "_networkManager", void 0);
-    _define_property8(this, "_swarmIdentity", void 0);
-    _define_property8(this, "_onSessionAuth", void 0);
-    _define_property8(this, "_onAuthFailure", void 0);
-    _define_property8(this, "blobSync", void 0);
-    _define_property8(this, "_disableP2pReplication", void 0);
-    _define_property8(this, "_topic", void 0);
-    _define_property8(this, "_spaceKey", void 0);
-    _define_property8(this, "_feeds", /* @__PURE__ */ new Set());
-    _define_property8(this, "_sessions", new ComplexMap4(PublicKey5.hash));
-    _define_property8(this, "_topology", new MMSTTopology({
-      originateConnections: 4,
-      maxPeers: 10,
-      sampleSize: 20
-    }));
-    _define_property8(this, "_connection", void 0);
-    _define_property8(this, "feedAdded", new CallbackCollection());
-    this._spaceKey = topic;
-    this._networkManager = networkManager;
-    this._swarmIdentity = swarmIdentity;
-    this._onSessionAuth = onSessionAuth;
-    this._onAuthFailure = onAuthFailure;
-    this.blobSync = new BlobSync({
-      blobStore
-    });
-    this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
-    this._disableP2pReplication = disableP2pReplication ?? false;
-  }
 };
 _ts_decorate6([
   logInfo2,
@@ -1927,19 +1444,41 @@ _ts_decorate6([
 SpaceProtocol = _ts_decorate6([
   trace3.resource()
 ], SpaceProtocol);
-var AuthStatus = /* @__PURE__ */ function(AuthStatus2) {
+var AuthStatus = /* @__PURE__ */ (function(AuthStatus2) {
   AuthStatus2["INITIAL"] = "INITIAL";
   AuthStatus2["SUCCESS"] = "SUCCESS";
   AuthStatus2["FAILURE"] = "FAILURE";
   return AuthStatus2;
-}({});
+})({});
 var SpaceProtocolSession = class {
+  _wireProps;
+  _disableP2pReplication;
+  _onSessionAuth;
+  _onAuthFailure;
+  _swarmIdentity;
+  _blobSync;
+  _teleport;
+  // TODO(dmaretskyi): Start with upload=false when switching it on the fly works.
+  replicator = new ReplicatorExtension().setOptions({
+    upload: true
+  });
+  _authStatus = "INITIAL";
   get authStatus() {
     return this._authStatus;
   }
   get stats() {
     return this._teleport.stats;
   }
+  // TODO(dmaretskyi): Allow to pass in extra extensions.
+  constructor({ wireProps, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication }) {
+    this._wireProps = wireProps;
+    this._swarmIdentity = swarmIdentity;
+    this._onSessionAuth = onSessionAuth;
+    this._onAuthFailure = onAuthFailure;
+    this._blobSync = blobSync;
+    this._teleport = new Teleport(wireProps);
+    this._disableP2pReplication = disableP2pReplication ?? false;
+  }
   get stream() {
     return this._teleport.stream;
   }
@@ -1949,12 +1488,7 @@ var SpaceProtocolSession = class {
       provider: this._swarmIdentity.credentialProvider,
       verifier: this._swarmIdentity.credentialAuthenticator,
       onAuthSuccess: () => {
-        log8("Peer authenticated", void 0, {
-          F: __dxlog_file10,
-          L: 285,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log8("Peer authenticated", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 181, S: this });
         this._authStatus = "SUCCESS";
         this._onSessionAuth?.(this._teleport);
       },
@@ -1969,42 +1503,16 @@ var SpaceProtocolSession = class {
     this._teleport.addExtension("dxos.mesh.teleport.blobsync", this._blobSync.createExtension());
   }
   async close() {
-    log8("close", void 0, {
-      F: __dxlog_file10,
-      L: 304,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log8("close", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 197, S: this });
     await this._teleport.close();
   }
   async abort() {
     await this._teleport.abort();
   }
-  // TODO(dmaretskyi): Allow to pass in extra extensions.
-  constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication }) {
-    _define_property8(this, "_wireParams", void 0);
-    _define_property8(this, "_disableP2pReplication", void 0);
-    _define_property8(this, "_onSessionAuth", void 0);
-    _define_property8(this, "_onAuthFailure", void 0);
-    _define_property8(this, "_swarmIdentity", void 0);
-    _define_property8(this, "_blobSync", void 0);
-    _define_property8(this, "_teleport", void 0);
-    _define_property8(this, "replicator", new ReplicatorExtension().setOptions({
-      upload: true
-    }));
-    _define_property8(this, "_authStatus", "INITIAL");
-    this._wireParams = wireParams;
-    this._swarmIdentity = swarmIdentity;
-    this._onSessionAuth = onSessionAuth;
-    this._onAuthFailure = onAuthFailure;
-    this._blobSync = blobSync;
-    this._teleport = new Teleport(wireParams);
-    this._disableP2pReplication = disableP2pReplication ?? false;
-  }
 };
 _ts_decorate6([
   logInfo2
-], SpaceProtocolSession.prototype, "_wireParams", void 0);
+], SpaceProtocolSession.prototype, "_wireProps", void 0);
 _ts_decorate6([
   logInfo2
 ], SpaceProtocolSession.prototype, "authStatus", null);
@@ -2016,29 +1524,28 @@ import { getCredentialAssertion } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
-import { trace as trace4 } from "@dxos/protocols";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
-function _define_property9(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-manager.ts";
 function _ts_decorate7(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-manager.ts";
 var SpaceManager = class {
+  _spaces = new ComplexMap5(PublicKey6.hash);
+  _feedStore;
+  _networkManager;
+  _metadataStore;
+  _blobStore;
+  _disableP2pReplication;
+  constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }) {
+    this._feedStore = feedStore;
+    this._networkManager = networkManager;
+    this._metadataStore = metadataStore;
+    this._blobStore = blobStore;
+    this._disableP2pReplication = disableP2pReplication ?? false;
+  }
   // TODO(burdon): Remove.
   get spaces() {
     return this._spaces;
@@ -2051,22 +1558,9 @@ var SpaceManager = class {
     ].map((space) => space.close()));
   }
   async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, onDelegatedInvitationStatusChange, onMemberRolesChanged, memberKey }) {
-    log9.trace("dxos.echo.space-manager.construct-space", trace4.begin({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file11,
-      L: 103,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     log9("constructing space...", {
       spaceKey: metadata.genesisFeedKey
-    }, {
-      F: __dxlog_file11,
-      L: 104,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file11, L: 47, S: this });
     const genesisFeed = await this._feedStore.openFeed(metadata.genesisFeedKey ?? failUndefined2());
     const spaceKey = metadata.key;
     const spaceId = await createIdFromSpaceKey(spaceKey);
@@ -2091,34 +1585,12 @@ var SpaceManager = class {
       onMemberRolesChanged
     });
     this._spaces.set(space.key, space);
-    log9.trace("dxos.echo.space-manager.construct-space", trace4.end({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file11,
-      L: 134,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     return space;
   }
-  async requestSpaceAdmissionCredential(params) {
-    const traceKey = "dxos.echo.space-manager.request-space-admission";
-    log9.trace(traceKey, trace4.begin({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file11,
-      L: 140,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+  async requestSpaceAdmissionCredential(ctx, params) {
     log9("requesting space admission credential...", {
       spaceKey: params.spaceKey
-    }, {
-      F: __dxlog_file11,
-      L: 141,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file11, L: 78, S: this });
     const onCredentialResolved = new Trigger2();
     const protocol = new SpaceProtocol({
       topic: params.spaceKey,
@@ -2135,32 +1607,15 @@ var SpaceManager = class {
       disableP2pReplication: this._disableP2pReplication
     });
     try {
-      await protocol.start();
+      await protocol.start(ctx);
       const credential = await onCredentialResolved.wait({
         timeout: params.timeout
       });
-      log9.trace(traceKey, trace4.end({
-        id: this._instanceId
-      }), {
-        F: __dxlog_file11,
-        L: 165,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       return credential;
     } catch (err) {
-      log9.trace(traceKey, trace4.error({
-        id: this._instanceId,
-        error: err
-      }), {
-        F: __dxlog_file11,
-        L: 168,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       throw err;
     } finally {
-      await protocol.stop();
+      await protocol.stop(ctx);
     }
   }
   findSpaceByRootDocumentId(documentId) {
@@ -2179,20 +1634,6 @@ var SpaceManager = class {
       });
     });
   }
-  constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }) {
-    _define_property9(this, "_spaces", new ComplexMap5(PublicKey6.hash));
-    _define_property9(this, "_feedStore", void 0);
-    _define_property9(this, "_networkManager", void 0);
-    _define_property9(this, "_metadataStore", void 0);
-    _define_property9(this, "_blobStore", void 0);
-    _define_property9(this, "_instanceId", PublicKey6.random().toHex());
-    _define_property9(this, "_disableP2pReplication", void 0);
-    this._feedStore = feedStore;
-    this._networkManager = networkManager;
-    this._metadataStore = metadataStore;
-    this._blobStore = blobStore;
-    this._disableP2pReplication = disableP2pReplication ?? false;
-  }
 };
 _ts_decorate7([
   synchronized4
@@ -2227,4 +1668,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-I4JBIZSN.mjs.map
+//# sourceMappingURL=chunk-VIHYDCCC.mjs.map