@dxos/echo-pipeline 0.8.4-main.f9ba587 → 0.8.4-main.fcc0d83b33

package/dist/lib/{browser/chunk-GBFX5J5B.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,13 +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";
+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,
@@ -79,15 +63,16 @@ 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._metadata = emptyEchoMetadata();
-    this._spaceLargeMetadata = new ComplexMap2(PublicKey2.hash);
-    this._metadataFile = void 0;
-    this.update = new Event();
-    this._invitationCleanupCtx = new Context(void 0, {
-      F: __dxlog_file2,
-      L: 55
-    });
     this._directory = directory;
   }
   get metadata() {
@@ -115,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 {
@@ -151,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();
@@ -184,12 +164,7 @@ var MetadataStore = class {
     } 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([
@@ -201,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 () => {
@@ -238,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) {
@@ -259,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) {
@@ -289,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();
   }
@@ -302,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();
@@ -332,15 +276,7 @@ var MetadataStore = class {
     await this.flush();
   }
   async addSpace(record) {
-    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'"
-      ]
-    });
+    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();
@@ -409,13 +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";
+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
@@ -429,9 +365,11 @@ 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.update = new Event2();
     this._pendingTimeframe = _timeframe;
   }
   /**
@@ -472,23 +410,13 @@ 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();
     });
   }
@@ -498,7 +426,7 @@ _ts_decorate2([
 ], TimeframeClock.prototype, "waitUntilReached", null);
 
 // src/pipeline/pipeline.ts
-import { Event as Event3, sleepWithContext, synchronized as synchronized2, Trigger } from "@dxos/async";
+import { Event as Event3, Trigger, sleepWithContext, synchronized as synchronized2 } from "@dxos/async";
 import { Context as Context2, rejectOnDispose } from "@dxos/context";
 import { failUndefined } from "@dxos/debug";
 import { FeedSetIterator } from "@dxos/feed-store";
@@ -516,48 +444,54 @@ 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
+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;
-    this._ctx = new Context2(void 0, {
-      F: __dxlog_file5,
-      L: 41
-    });
-    this.timeframeUpdate = this._timeframeClock.update;
-    this.stalled = new Event3();
-    this._startTimeframe = new Timeframe2();
-    this._reachedTarget = false;
   }
   /**
   * Latest theoretical timeframe based on the last mutation in each feed.
@@ -601,20 +535,12 @@ 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: 129
-  }), 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: 133,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~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();
@@ -641,12 +567,7 @@ var PipelineState = class {
             current: this.timeframe,
             target: this.targetTimeframe,
             dependencies: Timeframe2.dependencies(this.targetTimeframe, this.timeframe)
-          }, {
-            F: __dxlog_file5,
-            L: 161,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 118, S: this });
         })
       ]);
     } else {
@@ -655,34 +576,28 @@ var PipelineState = class {
   }
 };
 var Pipeline = class {
-  constructor() {
-    this._timeframeClock = new TimeframeClock(new Timeframe2());
-    this._feeds = new ComplexMap3(PublicKey3.hash);
-    // External state accessor.
-    this._state = new PipelineState(this._feeds, this._timeframeClock);
-    // Waits for the message consumer to process the message and yield control back to the pipeline.
-    this._processingTrigger = new Trigger().wake();
-    this._pauseTrigger = new Trigger().wake();
-    // Pending downloads.
-    this._downloads = new ComplexMap3((value) => PublicKey3.hash(value.key));
-    this._isStopping = false;
-    this._isStarted = false;
-    this._isBeingConsumed = false;
-    this._isPaused = false;
-  }
+  _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: 243,
-      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) {
@@ -703,54 +618,20 @@ var Pipeline = class {
     }
   }
   setWriteFeed(feed) {
-    invariant4(!this._writer, "Writer already set.", {
-      F: __dxlog_file5,
-      L: 270,
-      S: this,
-      A: [
-        "!this._writer",
-        "'Writer already set.'"
-      ]
-    });
-    invariant4(feed.properties.writable, "Feed must be writable.", {
-      F: __dxlog_file5,
-      L: 271,
-      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: 284,
-      S: this,
-      A: [
-        "!this._isStarted",
-        "'Pipeline is already started.'"
-      ]
-    });
-    log4("starting...", void 0, {
-      F: __dxlog_file5,
-      L: 285,
-      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: 289,
-      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);
@@ -758,12 +639,7 @@ var Pipeline = class {
     }
   }
   async stop() {
-    log4("stopping...", void 0, {
-      F: __dxlog_file5,
-      L: 300,
-      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);
@@ -772,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: 309
-    });
+    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: 313,
-      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: 322,
-      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) {
@@ -820,15 +680,7 @@ var Pipeline = class {
     this._isPaused = true;
   }
   async unpause() {
-    invariant4(this._isPaused, "Pipeline is not paused.", {
-      F: __dxlog_file5,
-      L: 351,
-      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()) {
@@ -840,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: 366,
-      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: 369,
-      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: 378,
-          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]();
       }
@@ -899,12 +727,7 @@ var Pipeline = class {
       feed: feed.key.truncate(),
       seq,
       length: feed.length
-    }, {
-      F: __dxlog_file5,
-      L: 407,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 311, S: this });
     handle = feed.download({
       start: seq + 1,
       linear: true
@@ -913,12 +736,7 @@ var Pipeline = class {
       } else {
         log4("downloaded", {
           data
-        }, {
-          F: __dxlog_file5,
-          L: 412,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 323, S: this });
       }
     });
     this._downloads.set(feed, handle);
@@ -932,12 +750,7 @@ 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: 426,
-        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()) {
@@ -971,7 +784,13 @@ import { schema as schema3 } from "@dxos/protocols/proto";
 import { RpcExtension } from "@dxos/teleport";
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/auth.ts";
 var AuthExtension = class extends RpcExtension {
-  constructor(_authParams) {
+  _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")
@@ -980,26 +799,14 @@ var AuthExtension = class extends RpcExtension {
         AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
       },
       timeout: 60 * 1e3
-    }), 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
-    });
+    }), 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");
             }
@@ -1007,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");
           }
         }
@@ -1027,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();
       }
     });
   }
@@ -1070,7 +851,7 @@ var AuthExtension = class extends RpcExtension {
 };
 
 // src/space/space.ts
-import { Event as Event4, scheduleMicroTask, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { Event as Event4, scheduleMicroTask as scheduleMicroTask2, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { Resource } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log7, logInfo } from "@dxos/log";
@@ -1079,7 +860,7 @@ import { trace as trace2 } from "@dxos/tracing";
 import { Callback as Callback2 } from "@dxos/util";
 
 // src/space/control-pipeline.ts
-import { DeferredTask, sleepWithContext as sleepWithContext2, trackLeaks } from "@dxos/async";
+import { DeferredTask, scheduleMicroTask, sleepWithContext as sleepWithContext2, trackLeaks } from "@dxos/async";
 import { Context as Context4 } from "@dxos/context";
 import { SpaceStateMachine } from "@dxos/credentials";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
@@ -1088,30 +869,36 @@ 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";
+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._ctx = new Context4(void 0, {
-      F: __dxlog_file7,
-      L: 47
-    });
-    this._lastTimeframeSaveTime = Date.now();
-    this.onFeedAdmitted = new Callback();
-    this._usage = new TimeUsageCounter();
-    this._mutations = new TimeSeriesCounter();
-    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();
@@ -1120,26 +907,19 @@ var ControlPipeline = class {
     this._spaceStateMachine.onFeedAdmitted.set(async (info) => {
       log6("feed admitted", {
         key: info.key
-      }, {
-        F: __dxlog_file7,
-        L: 82,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 50, S: this });
       if (info.assertion.designation === AdmittedFeed.Designation.CONTROL && !info.key.equals(genesisFeed.key)) {
-        queueMicrotask(async () => {
+        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: 93,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+            log6.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 65, S: this });
           }
         });
       }
@@ -1160,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: 123,
-      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: 128,
-      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: 130
-      }));
+      void this._consumePipeline(ctx);
     });
     await this._pipeline.start();
-    log6("started", void 0, {
-      F: __dxlog_file7,
-      L: 134,
-      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);
@@ -1205,12 +967,7 @@ var ControlPipeline = class {
       if (!result) {
         log6.warn("credential processing failed from snapshot", {
           message
-        }, {
-          F: __dxlog_file7,
-          L: 147,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 111, S: this });
       }
     }
   }
@@ -1227,12 +984,7 @@ var ControlPipeline = class {
     log6("save snapshot", {
       key: this._spaceKey,
       snapshot: getSnapshotLoggerContext(snapshot)
-    }, {
-      F: __dxlog_file7,
-      L: 163,
-      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) {
@@ -1242,12 +994,7 @@ var ControlPipeline = class {
       try {
         await this._processMessage(ctx, msg);
       } catch (err) {
-        log6.catch(err, void 0, {
-          F: __dxlog_file7,
-          L: 176,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log6.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 140, S: this });
       }
       span.end();
     }
@@ -1256,12 +1003,7 @@ var ControlPipeline = class {
     log6("processing", {
       key: msg.feedKey,
       seq: msg.seq
-    }, {
-      F: __dxlog_file7,
-      L: 185,
-      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, {
@@ -1271,12 +1013,7 @@ var ControlPipeline = class {
       if (!result) {
         log6.warn("processing failed", {
           msg
-        }, {
-          F: __dxlog_file7,
-          L: 194,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 157, S: this });
       } else {
         await this._noteTargetStateIfNeeded(this._pipeline.state.pendingTimeframe);
       }
@@ -1290,21 +1027,11 @@ var ControlPipeline = class {
     }
   }
   async stop() {
-    log6("stopping...", void 0, {
-      F: __dxlog_file7,
-      L: 214,
-      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: 218,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log6("stopped", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 178, S: this });
   }
   async _saveTargetTimeframe(timeframe) {
     try {
@@ -1312,15 +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: 227,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log6(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 186, S: this });
     }
   }
 };
+_ts_decorate4([
+  trace.info({
+    spanAttribute: true
+  })
+], ControlPipeline.prototype, "_spaceKey", void 0);
 _ts_decorate4([
   trace.metricsCounter()
 ], ControlPipeline.prototype, "_usage", void 0);
@@ -1329,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(),
@@ -1356,27 +1084,27 @@ var getSnapshotLoggerContext = (snapshot) => {
 };
 
 // src/space/space.ts
+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 {
+  onCredentialProcessed = new Callback2();
+  stateUpdate = new Event4();
+  protocol;
+  _id;
+  _key;
+  _genesisFeedKey;
+  _feedProvider;
+  _controlPipeline;
+  _controlFeed;
+  _dataFeed;
   constructor(params) {
     super();
-    this.onCredentialProcessed = new Callback2();
-    this.stateUpdate = new Event4();
-    invariant6(params.spaceKey && params.feedProvider, void 0, {
-      F: __dxlog_file8,
-      L: 72,
-      S: this,
-      A: [
-        "params.spaceKey && params.feedProvider",
-        ""
-      ]
-    });
+    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;
@@ -1390,7 +1118,7 @@ var Space = class extends Resource {
     this._controlPipeline.onFeedAdmitted.set(async (info) => {
       const sparse = info.assertion.designation === AdmittedFeed2.Designation.DATA;
       if (!info.key.equals(params.genesisFeed.key)) {
-        scheduleMicroTask(this._ctx, async () => {
+        scheduleMicroTask2(this._ctx, async () => {
           await this.protocol.addFeed(await params.feedProvider(info.key, {
             sparse
           }));
@@ -1401,34 +1129,19 @@ var Space = class extends Resource {
       await this.onCredentialProcessed.callIfSet(credential);
       log7("onCredentialProcessed", {
         credential
-      }, {
-        F: __dxlog_file8,
-        L: 99,
-        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: 103,
-        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: 107,
-        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) => {
@@ -1437,12 +1150,7 @@ var Space = class extends Resource {
           m.key,
           m.role
         ])
-      }), {
-        F: __dxlog_file8,
-        L: 111,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }), { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 74, S: this });
       await params.onMemberRolesChanged(changedMembers);
     });
     this.protocol = params.protocol;
@@ -1472,29 +1180,13 @@ var Space = class extends Resource {
     return this._controlPipeline.pipeline;
   }
   async setControlFeed(feed) {
-    invariant6(!this._controlFeed, "Control feed already set.", {
-      F: __dxlog_file8,
-      L: 155,
-      S: this,
-      A: [
-        "!this._controlFeed",
-        "'Control feed already set.'"
-      ]
-    });
+    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.", {
-      F: __dxlog_file8,
-      L: 162,
-      S: this,
-      A: [
-        "!this._dataFeed",
-        "'Data feed already set.'"
-      ]
-    });
+    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;
   }
@@ -1505,50 +1197,22 @@ var Space = class extends Resource {
     return Array.from(this._controlPipeline.spaceState.feeds.values());
   }
   async _open(ctx) {
-    log7("opening...", void 0, {
-      F: __dxlog_file8,
-      L: 176,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._controlPipeline.start();
-    log7("opened", void 0, {
-      F: __dxlog_file8,
-      L: 181,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    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() {
-    invariant6(this.isOpen, void 0, {
-      F: __dxlog_file8,
-      L: 186,
-      S: this,
-      A: [
-        "this.isOpen",
-        ""
-      ]
-    });
-    await this.protocol.start();
+  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() {
+  async _close(ctx) {
     log7("closing...", {
       key: this._key
-    }, {
-      F: __dxlog_file8,
-      L: 193,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this.protocol.stop();
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 136, S: this });
+    await this.protocol.stop(ctx);
     await this._controlPipeline.stop();
-    log7("closed", void 0, {
-      F: __dxlog_file8,
-      L: 199,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log7("closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 142, S: this });
   }
 };
 _ts_decorate5([
@@ -1566,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
@@ -1587,15 +1253,15 @@ import { schema as schema4 } from "@dxos/protocols/proto";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
 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, this._ctx = new Context5(void 0, {
-      F: __dxlog_file9,
-      L: 26
-    });
+    }), this._request = _request, this._onResult = _onResult;
   }
   async getHandlers() {
     return {};
@@ -1619,6 +1285,7 @@ var CredentialRetrieverExtension = class extends RpcExtension2 {
   }
 };
 var CredentialServerExtension = class extends RpcExtension2 {
+  _space;
   constructor(_space) {
     super({
       exposed: {
@@ -1632,7 +1299,12 @@ var CredentialServerExtension = class extends RpcExtension2 {
         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
@@ -1653,26 +1325,44 @@ 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";
+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;
+  }
+  get feeds() {
+    return this._feeds;
+  }
+  get _ownPeerKey() {
+    return this._swarmIdentity.peerKey;
+  }
   constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }) {
-    this._feeds = /* @__PURE__ */ new Set();
-    this._sessions = new ComplexMap4(PublicKey5.hash);
-    // TODO(burdon): Move to config (with sensible defaults).
-    this._topology = new MMSTTopology({
-      originateConnections: 4,
-      maxPeers: 10,
-      sampleSize: 20
-    });
-    this.feedAdded = new CallbackCollection();
     this._spaceKey = topic;
     this._networkManager = networkManager;
     this._swarmIdentity = swarmIdentity;
@@ -1684,25 +1374,11 @@ var SpaceProtocol = class {
     this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
     this._disableP2pReplication = disableP2pReplication ?? false;
   }
-  get sessions() {
-    return this._sessions;
-  }
-  get feeds() {
-    return this._feeds;
-  }
-  get _ownPeerKey() {
-    return this._swarmIdentity.peerKey;
-  }
   // 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: 128,
-      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);
@@ -1710,64 +1386,44 @@ 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: 149,
-      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: 158,
-      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: 169,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._connection.close();
-      log8("stopped", void 0, {
-        F: __dxlog_file10,
-        L: 171,
-        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);
       }
@@ -1788,34 +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({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication }) {
-    // TODO(dmaretskyi): Start with upload=false when switching it on the fly works.
-    this.replicator = new ReplicatorExtension().setOptions({
-      upload: true
-    });
-    this._authStatus = "INITIAL";
-    this._wireParams = wireParams;
+  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(wireParams);
+    this._teleport = new Teleport(wireProps);
     this._disableP2pReplication = disableP2pReplication ?? false;
   }
-  get authStatus() {
-    return this._authStatus;
-  }
-  get stats() {
-    return this._teleport.stats;
-  }
   get stream() {
     return this._teleport.stream;
   }
@@ -1825,12 +1488,7 @@ var SpaceProtocolSession = class {
       provider: this._swarmIdentity.credentialProvider,
       verifier: this._swarmIdentity.credentialAuthenticator,
       onAuthSuccess: () => {
-        log8("Peer authenticated", void 0, {
-          F: __dxlog_file10,
-          L: 282,
-          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);
       },
@@ -1845,12 +1503,7 @@ var SpaceProtocolSession = class {
     this._teleport.addExtension("dxos.mesh.teleport.blobsync", this._blobSync.createExtension());
   }
   async close() {
-    log8("close", void 0, {
-      F: __dxlog_file10,
-      L: 301,
-      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() {
@@ -1859,31 +1512,34 @@ var SpaceProtocolSession = class {
 };
 _ts_decorate6([
   logInfo2
-], SpaceProtocolSession.prototype, "_wireParams", void 0);
+], SpaceProtocolSession.prototype, "_wireProps", void 0);
 _ts_decorate6([
   logInfo2
 ], SpaceProtocolSession.prototype, "authStatus", null);
 
 // src/space/space-manager.ts
 import { parseAutomergeUrl } from "@automerge/automerge-repo";
-import { synchronized as synchronized4, trackLeaks as trackLeaks3, Trigger as Trigger2 } from "@dxos/async";
+import { Trigger as Trigger2, synchronized as synchronized4, trackLeaks as trackLeaks3 } from "@dxos/async";
 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";
+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._spaces = new ComplexMap5(PublicKey6.hash);
-    this._instanceId = PublicKey6.random().toHex();
     this._feedStore = feedStore;
     this._networkManager = networkManager;
     this._metadataStore = metadataStore;
@@ -1902,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: 102,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     log9("constructing space...", {
       spaceKey: metadata.genesisFeedKey
-    }, {
-      F: __dxlog_file11,
-      L: 103,
-      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);
@@ -1942,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: 133,
-      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: 139,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+  async requestSpaceAdmissionCredential(ctx, params) {
     log9("requesting space admission credential...", {
       spaceKey: params.spaceKey
-    }, {
-      F: __dxlog_file11,
-      L: 140,
-      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,
@@ -1986,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: 164,
-        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: 167,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       throw err;
     } finally {
-      await protocol.stop();
+      await protocol.stop(ctx);
     }
   }
   findSpaceByRootDocumentId(documentId) {
@@ -2064,4 +1668,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-GBFX5J5B.mjs.map
+//# sourceMappingURL=chunk-VIHYDCCC.mjs.map