@dxos/echo-pipeline 0.1.56-main.c19b7cd → 0.1.56-main.c277f68

package/dist/lib/node/testing/index.cjs

@@ -42,7 +42,7 @@ __export(testing_exports, {
 module.exports = __toCommonJS(testing_exports);
 
 // packages/core/echo/echo-pipeline/src/testing/test-agent-builder.ts
-var import_context6 = require("@dxos/context");
+var import_context7 = require("@dxos/context");
 var import_credentials5 = require("@dxos/credentials");
 var import_document_model = require("@dxos/document-model");
 var import_keys7 = require("@dxos/keys");
@@ -61,6 +61,7 @@ var import_context = require("@dxos/context");
 var import_echo_db = require("@dxos/echo-db");
 var import_invariant = require("@dxos/invariant");
 var import_log = require("@dxos/log");
+var import_service = require("@dxos/protocols/proto/dxos/echo/service");
 var import_util = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service-host.ts";
 var DataServiceHost = class {
@@ -88,12 +89,19 @@ var DataServiceHost = class {
           objects
         }
       });
+      this._itemDemuxer.snapshot.on(ctx, (snapshot) => {
+        next({
+          action: import_service.EchoEvent.DatabaseAction.RESET,
+          batch: {
+            objects: snapshot.items
+          }
+        });
+      });
       this._itemDemuxer.mutation.on(ctx, (message) => {
-        var _a;
         const { batch, meta } = message;
         (0, import_invariant.invariant)(!meta.clientTag, "Unexpected client tag in mutation message", {
           F: __dxlog_file,
-          L: 61,
+          L: 68,
           S: this,
           A: [
             "!(meta as any).clientTag",
@@ -101,11 +109,11 @@ var DataServiceHost = class {
           ]
         });
         (0, import_log.log)("message", {
-          batch,
+          batch: batch.objects?.length,
           meta
         }, {
           F: __dxlog_file,
-          L: 62,
+          L: 69,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -113,7 +121,7 @@ var DataServiceHost = class {
           message.meta.feedKey,
           message.meta.seq
         ]);
-        (_a = batch.objects) == null ? void 0 : _a.forEach((object) => {
+        batch.objects?.forEach((object) => {
           (0, import_echo_db.setMetadataOnObject)(object, {
             ...meta
           });
@@ -131,10 +139,9 @@ var DataServiceHost = class {
     });
   }
   async write(request) {
-    var _a, _b;
     (0, import_invariant.invariant)(!this._ctx.disposed, "Cannot write to closed DataServiceHost", {
       F: __dxlog_file,
-      L: 88,
+      L: 95,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -143,7 +150,7 @@ var DataServiceHost = class {
     });
     (0, import_invariant.invariant)(this._writeStream, "Cannot write mutations in readonly mode", {
       F: __dxlog_file,
-      L: 89,
+      L: 96,
       S: this,
       A: [
         "this._writeStream",
@@ -152,10 +159,10 @@ var DataServiceHost = class {
     });
     (0, import_log.log)("write", {
       clientTag: request.clientTag,
-      objectCount: (_b = (_a = request.batch.objects) == null ? void 0 : _a.length) != null ? _b : 0
+      objectCount: request.batch.objects?.length ?? 0
     }, {
       F: __dxlog_file,
-      L: 91,
+      L: 98,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -169,7 +176,7 @@ var DataServiceHost = class {
             seq: receipt2.seq
           }, {
             F: __dxlog_file,
-            L: 100,
+            L: 107,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -183,24 +190,18 @@ var DataServiceHost = class {
     return receipt;
   }
 };
-var createDataMessage = (batch) => {
-  var _a;
-  return {
-    batch: {
-      objects: (_a = batch.objects) == null ? void 0 : _a.map((object) => {
-        var _a2;
-        return {
-          ...object,
-          mutations: (_a2 = object.mutations) == null ? void 0 : _a2.map((mutation) => ({
-            ...mutation,
-            meta: void 0
-          })),
-          meta: void 0
-        };
-      })
-    }
-  };
-};
+var createDataMessage = (batch) => ({
+  batch: {
+    objects: batch.objects?.map((object) => ({
+      ...object,
+      mutations: object.mutations?.map((mutation) => ({
+        ...mutation,
+        meta: void 0
+      })),
+      meta: void 0
+    }))
+  }
+});
 
 // packages/core/echo/echo-pipeline/src/db-host/database-host.ts
 var import_echo_db2 = require("@dxos/echo-db");
@@ -229,8 +230,7 @@ var DatabaseHost = class {
     return this._itemDemuxer.createSnapshot();
   }
   createDataServiceHost() {
-    var _a;
-    return new DataServiceHost(this._itemManager, this._itemDemuxer, (_a = this._outboundStream) != null ? _a : void 0);
+    return new DataServiceHost(this._itemManager, this._itemDemuxer, this._outboundStream ?? void 0);
   }
 };
 
@@ -376,7 +376,7 @@ var DataServiceSubscriptions = class {
       C: (f, a) => f(...a)
     });
     const host = this._spaces.get(spaceKey);
-    await (host == null ? void 0 : host.close());
+    await host?.close();
     this._spaces.delete(spaceKey);
   }
   getDataService(spaceKey) {
@@ -388,7 +388,6 @@ var DataServiceImpl = class {
     this._subscriptions = _subscriptions;
   }
   subscribe(request) {
-    var _a;
     (0, import_invariant2.invariant)(request.spaceKey, void 0, {
       F: __dxlog_file2,
       L: 56,
@@ -398,11 +397,10 @@ var DataServiceImpl = class {
         ""
       ]
     });
-    const host = (_a = this._subscriptions.getDataService(request.spaceKey)) != null ? _a : (0, import_debug.raise)(new Error(`space not found: ${request.spaceKey}`));
+    const host = this._subscriptions.getDataService(request.spaceKey) ?? (0, import_debug.raise)(new Error(`space not found: ${request.spaceKey}`));
     return host.subscribe();
   }
   write(request) {
-    var _a;
     (0, import_invariant2.invariant)(request.spaceKey, void 0, {
       F: __dxlog_file2,
       L: 63,
@@ -421,7 +419,7 @@ var DataServiceImpl = class {
         ""
       ]
     });
-    const host = (_a = this._subscriptions.getDataService(request.spaceKey)) != null ? _a : (0, import_debug.raise)(new Error(`space not found: ${request.spaceKey}`));
+    const host = this._subscriptions.getDataService(request.spaceKey) ?? (0, import_debug.raise)(new Error(`space not found: ${request.spaceKey}`));
     return host.write(request);
   }
 };
@@ -449,8 +447,8 @@ var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipelin
 var emptyEchoMetadata = () => ({
   version: import_protocols3.STORAGE_VERSION,
   spaces: [],
-  created: new Date(),
-  updated: new Date()
+  created: /* @__PURE__ */ new Date(),
+  updated: /* @__PURE__ */ new Date()
 });
 var EchoMetadata = import_protocols3.schema.getCodecForType("dxos.echo.metadata.EchoMetadata");
 var MetadataStore = class {
@@ -464,22 +462,19 @@ var MetadataStore = class {
     return this._metadata;
   }
   get version() {
-    var _a;
-    return (_a = this._metadata.version) != null ? _a : 0;
+    return this._metadata.version ?? 0;
   }
   /**
   * Returns a list of currently saved spaces. The list and objects in it can be modified addSpace and
   * addSpaceFeed functions.
   */
   get spaces() {
-    var _a;
-    return (_a = this._metadata.spaces) != null ? _a : [];
+    return this._metadata.spaces ?? [];
   }
   /**
   * Loads metadata from persistent storage.
   */
   async load() {
-    var _a;
     const file = this._directory.getOrCreateFile("EchoMetadata");
     try {
       const { size: fileLength } = await file.stat();
@@ -498,7 +493,10 @@ var MetadataStore = class {
         C: (f, a) => f(...a)
       });
       if (fileLength < dataSize + 8) {
-        throw new import_errors.DataCorruptionError("Metadata size is smaller than expected.");
+        throw new import_errors.DataCorruptionError("Metadata size is smaller than expected.", {
+          fileLength,
+          dataSize
+        });
       }
       const data = await file.read(8, dataSize);
       const calculatedChecksum = import_crc_32.default.buf(data);
@@ -506,9 +504,8 @@ var MetadataStore = class {
         throw new import_errors.DataCorruptionError("Metadata checksum is invalid.");
       }
       this._metadata = EchoMetadata.decode(data);
-      (_a = this._metadata.spaces) == null ? void 0 : _a.forEach((space) => {
-        var _a2;
-        (_a2 = space.state) != null ? _a2 : space.state = import_services.SpaceState.ACTIVE;
+      this._metadata.spaces?.forEach((space) => {
+        space.state ??= import_services.SpaceState.ACTIVE;
       });
     } catch (err) {
       import_log3.log.error("failed to load metadata", {
@@ -525,12 +522,11 @@ var MetadataStore = class {
     }
   }
   async _save() {
-    var _a;
     const data = {
       ...this._metadata,
       version: import_protocols3.STORAGE_VERSION,
-      created: (_a = this._metadata.created) != null ? _a : new Date(),
-      updated: new Date()
+      created: this._metadata.created ?? /* @__PURE__ */ new Date(),
+      updated: /* @__PURE__ */ new Date()
     };
     this.update.emit(data);
     const file = this._directory.getOrCreateFile("EchoMetadata");
@@ -556,8 +552,7 @@ var MetadataStore = class {
     }
   }
   _getSpace(spaceKey) {
-    var _a;
-    if ((_a = this._metadata.identity) == null ? void 0 : _a.haloSpace.key.equals(spaceKey)) {
+    if (this._metadata.identity?.haloSpace.key.equals(spaceKey)) {
       return this._metadata.identity.haloSpace;
     }
     const space = this.spaces.find((space2) => space2.key === spaceKey);
@@ -602,8 +597,7 @@ var MetadataStore = class {
     await this._save();
   }
   async addSpace(record) {
-    var _a, _b, _c;
-    (0, import_invariant3.invariant)(!((_a = this._metadata.spaces) != null ? _a : []).find((space) => space.key === record.key), "Cannot overwrite existing space in metadata", {
+    (0, import_invariant3.invariant)(!(this._metadata.spaces ?? []).find((space) => space.key === record.key), "Cannot overwrite existing space in metadata", {
       F: __dxlog_file3,
       L: 162,
       S: this,
@@ -612,7 +606,7 @@ var MetadataStore = class {
         "'Cannot overwrite existing space in metadata'"
       ]
     });
-    ((_c = (_b = this._metadata).spaces) != null ? _c : _b.spaces = []).push(record);
+    (this._metadata.spaces ??= []).push(record);
     await this._save();
   }
   async setSpaceDataLatestTimeframe(spaceKey, timeframe) {
@@ -711,7 +705,7 @@ var AuthExtension = class extends import_teleport.RpcExtension {
         const { credential } = await this.rpc.AuthService.authenticate({
           challenge
         });
-        (0, import_invariant4.invariant)((credential == null ? void 0 : credential.length) > 0, "invalid credential", {
+        (0, import_invariant4.invariant)(credential?.length > 0, "invalid credential", {
           F: __dxlog_file4,
           L: 69,
           S: this,
@@ -754,15 +748,17 @@ var import_async7 = require("@dxos/async");
 var import_invariant9 = require("@dxos/invariant");
 var import_log10 = require("@dxos/log");
 var import_credentials4 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_tracing = require("@dxos/tracing");
+var import_tracing3 = require("@dxos/tracing");
 var import_util7 = require("@dxos/util");
 
 // packages/core/echo/echo-pipeline/src/space/control-pipeline.ts
+var import_context5 = require("@dxos/context");
 var import_credentials = require("@dxos/credentials");
 var import_keys4 = require("@dxos/keys");
 var import_log8 = require("@dxos/log");
 var import_credentials2 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
+var import_tracing = require("@dxos/tracing");
 var import_util5 = require("@dxos/util");
 
 // packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts
@@ -995,7 +991,6 @@ var PipelineState = class {
   * @param timeout Timeout in milliseconds to specify the maximum wait time.
   */
   async waitUntilReachedTargetTimeframe({ ctx = new import_context4.Context(), timeout, breakOnStall = true } = {}) {
-    var _a;
     (0, import_log7.log)("waitUntilReachedTargetTimeframe", {
       timeout,
       current: this.timeframe,
@@ -1006,7 +1001,7 @@ var PipelineState = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    (_a = this._reachedTargetPromise) != null ? _a : this._reachedTargetPromise = Promise.race([
+    this._reachedTargetPromise ??= Promise.race([
       this._timeframeClock.update.waitForCondition(() => {
         return import_timeframe2.Timeframe.dependencies(this.targetTimeframe, this.timeframe).isEmpty();
       }),
@@ -1053,9 +1048,11 @@ var Pipeline = class {
     // Waits for the message consumer to process the message and yield control back to the pipeline.
     this._processingTrigger = new import_async5.Trigger().wake();
     this._pauseTrigger = new import_async5.Trigger().wake();
+    // Pending downloads.
+    this._downloads = new import_util4.ComplexMap((value) => import_keys3.PublicKey.hash(value.key));
     this._isStopping = false;
     this._isStarted = false;
-    this._isOpen = false;
+    this._isBeingConsumed = false;
     this._isPaused = false;
   }
   get state() {
@@ -1064,7 +1061,7 @@ var Pipeline = class {
   get writer() {
     (0, import_invariant7.invariant)(this._writer, "Writer not set.", {
       F: __dxlog_file8,
-      L: 230,
+      L: 233,
       S: this,
       A: [
         "this._writer",
@@ -1086,12 +1083,14 @@ var Pipeline = class {
     if (this._feedSetIterator) {
       await this._feedSetIterator.addFeed(feed);
     }
-    this._setFeedDownloadState(feed);
+    if (this._isStarted && !this._isPaused) {
+      this._setFeedDownloadState(feed);
+    }
   }
   setWriteFeed(feed) {
     (0, import_invariant7.invariant)(!this._writer, "Writer already set.", {
       F: __dxlog_file8,
-      L: 253,
+      L: 260,
       S: this,
       A: [
         "!this._writer",
@@ -1100,7 +1099,7 @@ var Pipeline = class {
     });
     (0, import_invariant7.invariant)(feed.properties.writable, "Feed must be writable.", {
       F: __dxlog_file8,
-      L: 254,
+      L: 261,
       S: this,
       A: [
         "feed.properties.writable",
@@ -1115,7 +1114,7 @@ var Pipeline = class {
   async start() {
     (0, import_invariant7.invariant)(!this._isStarted, "Pipeline is already started.", {
       F: __dxlog_file8,
-      L: 267,
+      L: 274,
       S: this,
       A: [
         "!this._isStarted",
@@ -1124,7 +1123,7 @@ var Pipeline = class {
     });
     (0, import_log7.log)("starting...", void 0, {
       F: __dxlog_file8,
-      L: 268,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1133,21 +1132,29 @@ var Pipeline = class {
     this._isStarted = true;
     (0, import_log7.log)("started", void 0, {
       F: __dxlog_file8,
-      L: 272,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
+    if (!this._isPaused) {
+      for (const feed of this._feeds.values()) {
+        this._setFeedDownloadState(feed);
+      }
+    }
   }
   async stop() {
-    var _a;
     (0, import_log7.log)("stopping...", void 0, {
       F: __dxlog_file8,
-      L: 277,
+      L: 290,
       S: this,
       C: (f, a) => f(...a)
     });
     this._isStopping = true;
-    await ((_a = this._feedSetIterator) == null ? void 0 : _a.close());
+    for (const [feed, handle] of this._downloads.entries()) {
+      feed.undownload(handle);
+    }
+    this._downloads.clear();
+    await this._feedSetIterator?.close();
     await this._processingTrigger.wait();
     await this._state._ctx.dispose();
     this._state._ctx = new import_context4.Context();
@@ -1155,7 +1162,7 @@ var Pipeline = class {
     this._isStarted = false;
     (0, import_log7.log)("stopped", void 0, {
       F: __dxlog_file8,
-      L: 285,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1167,7 +1174,7 @@ var Pipeline = class {
   async setCursor(timeframe) {
     (0, import_invariant7.invariant)(!this._isStarted || this._isPaused, "Invalid state.", {
       F: __dxlog_file8,
-      L: 294,
+      L: 311,
       S: this,
       A: [
         "!this._isStarted || this._isPaused",
@@ -1176,9 +1183,6 @@ var Pipeline = class {
     });
     this._state._startTimeframe = timeframe;
     this._timeframeClock.setTimeframe(timeframe);
-    for (const feed of this._feeds.values()) {
-      this._setFeedDownloadState(feed);
-    }
     if (this._feedSetIterator) {
       await this._feedSetIterator.close();
       await this._initIterator();
@@ -1189,15 +1193,6 @@ var Pipeline = class {
   * Calling pause while processing will cause a deadlock.
   */
   async pause() {
-    (0, import_invariant7.invariant)(this._isStarted, "Pipeline is not open.", {
-      F: __dxlog_file8,
-      L: 316,
-      S: this,
-      A: [
-        "this._isStarted",
-        "'Pipeline is not open.'"
-      ]
-    });
     if (this._isPaused) {
       return;
     }
@@ -1206,18 +1201,9 @@ var Pipeline = class {
     this._isPaused = true;
   }
   async unpause() {
-    (0, import_invariant7.invariant)(this._isStarted, "Pipeline is not open.", {
-      F: __dxlog_file8,
-      L: 328,
-      S: this,
-      A: [
-        "this._isStarted",
-        "'Pipeline is not open.'"
-      ]
-    });
     (0, import_invariant7.invariant)(this._isPaused, "Pipeline is not paused.", {
       F: __dxlog_file8,
-      L: 329,
+      L: 340,
       S: this,
       A: [
         "this._isPaused",
@@ -1226,25 +1212,28 @@ var Pipeline = class {
     });
     this._pauseTrigger.wake();
     this._isPaused = false;
+    for (const feed of this._feeds.values()) {
+      this._setFeedDownloadState(feed);
+    }
   }
   /**
   * Starts to iterate over the ordered messages from the added feeds.
   * Updates the timeframe clock after the message has bee processed.
   */
   async *consume() {
-    (0, import_invariant7.invariant)(!this._isOpen, "Pipeline is already being consumed.", {
+    (0, import_invariant7.invariant)(!this._isBeingConsumed, "Pipeline is already being consumed.", {
       F: __dxlog_file8,
-      L: 340,
+      L: 355,
       S: this,
       A: [
-        "!this._isOpen",
+        "!this._isBeingConsumed",
         "'Pipeline is already being consumed.'"
       ]
     });
-    this._isOpen = true;
+    this._isBeingConsumed = true;
     (0, import_invariant7.invariant)(this._feedSetIterator, "Iterator not initialized.", {
       F: __dxlog_file8,
-      L: 343,
+      L: 358,
       S: this,
       A: [
         "this._feedSetIterator",
@@ -1258,7 +1247,7 @@ var Pipeline = class {
       if (lastFeedSetIterator !== this._feedSetIterator) {
         (0, import_invariant7.invariant)(this._feedSetIterator, "Iterator not initialized.", {
           F: __dxlog_file8,
-          L: 352,
+          L: 367,
           S: this,
           A: [
             "this._feedSetIterator",
@@ -1270,7 +1259,7 @@ var Pipeline = class {
       }
       const { done, value } = await iterable.next();
       if (!done) {
-        const block = value != null ? value : (0, import_debug3.failUndefined)();
+        const block = value ?? (0, import_debug3.failUndefined)();
         this._processingTrigger.reset();
         this._timeframeClock.updatePendingTimeframe(import_keys3.PublicKey.from(block.feedKey), block.seq);
         yield block;
@@ -1278,33 +1267,40 @@ var Pipeline = class {
         this._timeframeClock.updateTimeframe();
       }
     }
-    this._isOpen = false;
+    this._isBeingConsumed = false;
   }
   _setFeedDownloadState(feed) {
-    var _a;
+    let handle = this._downloads.get(feed);
+    if (handle) {
+      feed.undownload(handle);
+    }
     const timeframe = this._state._startTimeframe;
-    const seq = (_a = timeframe.get(feed.key)) != null ? _a : 0;
-    feed.undownload({
-      callback: () => (0, import_log7.log)("undownload", void 0, {
-        F: __dxlog_file8,
-        L: 377,
-        S: this,
-        C: (f, a) => f(...a)
-      })
+    const seq = timeframe.get(feed.key) ?? -1;
+    import_log7.log.info("download", {
+      feed: feed.key.truncate(),
+      seq,
+      length: feed.length
+    }, {
+      F: __dxlog_file8,
+      L: 396,
+      S: this,
+      C: (f, a) => f(...a)
     });
-    feed.download({
+    handle = feed.download({
       start: seq + 1,
       linear: true
-    }).catch((err) => {
-      (0, import_log7.log)("failed to download feed", {
-        err
-      }, {
-        F: __dxlog_file8,
-        L: 379,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+    }, (err, data) => {
+      if (err) {
+      } else {
+        import_log7.log.info("data", data, {
+          F: __dxlog_file8,
+          L: 401,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
     });
+    this._downloads.set(feed, handle);
   }
   async _initIterator() {
     this._feedSetIterator = new import_feed_store.FeedSetIterator(createMessageSelector(this._timeframeClock), {
@@ -1314,7 +1310,7 @@ var Pipeline = class {
     this._feedSetIterator.stalled.on((iterator) => {
       import_log7.log.warn(`Stalled after ${iterator.options.stallTimeout}ms with ${iterator.size} feeds.`, void 0, {
         F: __dxlog_file8,
-        L: 390,
+        L: 415,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1342,12 +1338,24 @@ _ts_decorate4([
 ], Pipeline.prototype, "unpause", null);
 
 // packages/core/echo/echo-pipeline/src/space/control-pipeline.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_file9 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/control-pipeline.ts";
 var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL = 500;
-var ControlPipeline = class {
+var ControlPipeline = class ControlPipeline2 {
   constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
     this._lastTimeframeSaveTime = Date.now();
     this.onFeedAdmitted = new import_util5.Callback();
+    this._usage = new import_tracing.TimeUsageCounter();
+    this._mutations = new import_tracing.TimeSeriesCounter();
     this._spaceKey = spaceKey;
     this._metadata = metadataStore;
     this._pipeline = new Pipeline();
@@ -1358,7 +1366,7 @@ var ControlPipeline = class {
         key: info.key
       }, {
         F: __dxlog_file9,
-        L: 51,
+        L: 61,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1369,7 +1377,7 @@ var ControlPipeline = class {
         } catch (err) {
           import_log8.log.catch(err, void 0, {
             F: __dxlog_file9,
-            L: 59,
+            L: 69,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1392,56 +1400,65 @@ var ControlPipeline = class {
   async start() {
     (0, import_log8.log)("starting...", void 0, {
       F: __dxlog_file9,
-      L: 83,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
     setTimeout(async () => {
-      for await (const msg of this._pipeline.consume()) {
-        try {
-          (0, import_log8.log)("processing", {
-            key: msg.feedKey,
-            seq: msg.seq
-          }, {
-            F: __dxlog_file9,
-            L: 88,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          if (msg.data.payload.credential) {
-            const timer = import_util5.tracer.mark("dxos.echo.pipeline.control");
-            const result = await this._spaceStateMachine.process(msg.data.payload.credential.credential, import_keys4.PublicKey.from(msg.feedKey));
-            timer.end();
-            if (!result) {
-              import_log8.log.warn("processing failed", {
-                msg
-              }, {
-                F: __dxlog_file9,
-                L: 98,
-                S: this,
-                C: (f, a) => f(...a)
-              });
-            } else {
-              await this._noteTargetStateIfNeeded(this._pipeline.state.pendingTimeframe);
-            }
-          }
-        } catch (err) {
-          import_log8.log.catch(err, void 0, {
-            F: __dxlog_file9,
-            L: 104,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        }
-      }
+      void this._consumePipeline(new import_context5.Context());
     });
     await this._pipeline.start();
     (0, import_log8.log)("started", void 0, {
       F: __dxlog_file9,
-      L: 110,
+      L: 99,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+  async _consumePipeline(ctx) {
+    for await (const msg of this._pipeline.consume()) {
+      const span = this._usage.beginRecording();
+      this._mutations.inc();
+      try {
+        await this._processMessage(ctx, msg);
+      } catch (err) {
+        import_log8.log.catch(err, void 0, {
+          F: __dxlog_file9,
+          L: 111,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      span.end();
+    }
+  }
+  async _processMessage(ctx, msg) {
+    (0, import_log8.log)("processing", {
+      key: msg.feedKey,
+      seq: msg.seq
+    }, {
+      F: __dxlog_file9,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
+    if (msg.data.payload.credential) {
+      const timer = import_util5.tracer.mark("dxos.echo.pipeline.control");
+      const result = await this._spaceStateMachine.process(msg.data.payload.credential.credential, import_keys4.PublicKey.from(msg.feedKey));
+      timer.end();
+      if (!result) {
+        import_log8.log.warn("processing failed", {
+          msg
+        }, {
+          F: __dxlog_file9,
+          L: 131,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      } else {
+        await this._noteTargetStateIfNeeded(this._pipeline.state.pendingTimeframe);
+      }
+    }
   }
   async _noteTargetStateIfNeeded(timeframe) {
     if (Date.now() - this._lastTimeframeSaveTime > TIMEFRAME_SAVE_DEBOUNCE_INTERVAL) {
@@ -1452,7 +1469,7 @@ var ControlPipeline = class {
   async stop() {
     (0, import_log8.log)("stopping...", void 0, {
       F: __dxlog_file9,
-      L: 124,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1460,39 +1477,54 @@ var ControlPipeline = class {
     await this._saveTargetTimeframe(this._pipeline.state.timeframe);
     (0, import_log8.log)("stopped", void 0, {
       F: __dxlog_file9,
-      L: 127,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _saveTargetTimeframe(timeframe) {
-    var _a;
     try {
-      const newTimeframe = import_timeframe3.Timeframe.merge((_a = this._targetTimeframe) != null ? _a : new import_timeframe3.Timeframe(), timeframe);
+      const newTimeframe = import_timeframe3.Timeframe.merge(this._targetTimeframe ?? new import_timeframe3.Timeframe(), timeframe);
       await this._metadata.setSpaceControlLatestTimeframe(this._spaceKey, newTimeframe);
       this._targetTimeframe = newTimeframe;
     } catch (err) {
       (0, import_log8.log)(err, void 0, {
         F: __dxlog_file9,
-        L: 136,
+        L: 161,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
 };
+_ts_decorate5([
+  import_tracing.trace.metricsCounter()
+], ControlPipeline.prototype, "_usage", void 0);
+_ts_decorate5([
+  import_tracing.trace.metricsCounter()
+], ControlPipeline.prototype, "_mutations", void 0);
+_ts_decorate5([
+  import_tracing.trace.span()
+], ControlPipeline.prototype, "_consumePipeline", null);
+_ts_decorate5([
+  import_tracing.trace.span()
+], ControlPipeline.prototype, "_processMessage", null);
+ControlPipeline = _ts_decorate5([
+  import_tracing.trace.resource()
+], ControlPipeline);
 
 // packages/core/echo/echo-pipeline/src/space/data-pipeline.ts
 var import_async6 = require("@dxos/async");
-var import_context5 = require("@dxos/context");
+var import_context6 = require("@dxos/context");
 var import_credentials3 = require("@dxos/credentials");
 var import_echo_db3 = require("@dxos/echo-db");
 var import_errors2 = require("@dxos/errors");
 var import_invariant8 = require("@dxos/invariant");
 var import_log9 = require("@dxos/log");
 var import_timeframe4 = require("@dxos/timeframe");
+var import_tracing2 = require("@dxos/tracing");
 var import_util6 = require("@dxos/util");
-function _ts_decorate5(decorators, target, key, desc) {
+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);
@@ -1509,7 +1541,7 @@ var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL2 = 500;
 var DataPipeline = class DataPipeline2 {
   constructor(_params) {
     this._params = _params;
-    this._ctx = new import_context5.Context();
+    this._ctx = new import_context6.Context();
     this._pipeline = void 0;
     this._targetTimeframe = void 0;
     this._lastAutomaticSnapshotTimeframe = new import_timeframe4.Timeframe();
@@ -1517,6 +1549,8 @@ var DataPipeline = class DataPipeline2 {
     this._lastTimeframeSaveTime = 0;
     this._lastSnapshotSaveTime = 0;
     this._lastProcessedEpoch = -1;
+    this._usage = new import_tracing2.TimeUsageCounter();
+    this._mutations = new import_tracing2.TimeSeriesCounter();
     this.currentEpoch = void 0;
     this.appliedEpoch = void 0;
     this.onNewEpoch = new import_async6.Event();
@@ -1528,13 +1562,11 @@ var DataPipeline = class DataPipeline2 {
     return this._pipeline;
   }
   get pipelineState() {
-    var _a;
-    return (_a = this._pipeline) == null ? void 0 : _a.state;
+    return this._pipeline?.state;
   }
   setTargetTimeframe(timeframe) {
-    var _a;
     this._targetTimeframe = timeframe;
-    (_a = this._pipeline) == null ? void 0 : _a.state.setTargetTimeframe(timeframe);
+    this._pipeline?.state.setTargetTimeframe(timeframe);
   }
   async processCredential(credential) {
     if (!(0, import_credentials3.checkCredentialType)(credential, "dxos.halo.credentials.Epoch")) {
@@ -1551,8 +1583,8 @@ var DataPipeline = class DataPipeline2 {
     }
     this._pipeline = new Pipeline();
     await this._params.onPipelineCreated(this._pipeline);
-    await this._pipeline.start();
     await this._pipeline.pause();
+    await this._pipeline.start();
     if (this._targetTimeframe) {
       this._pipeline.state.setTargetTimeframe(this._targetTimeframe);
     }
@@ -1560,7 +1592,7 @@ var DataPipeline = class DataPipeline2 {
       write: (data, options) => {
         (0, import_invariant8.invariant)(this._pipeline, "Pipeline is not initialized.", {
           F: __dxlog_file10,
-          L: 145,
+          L: 154,
           S: this,
           A: [
             "this._pipeline",
@@ -1569,7 +1601,7 @@ var DataPipeline = class DataPipeline2 {
         });
         (0, import_invariant8.invariant)(this.currentEpoch, "Epoch is not initialized.", {
           F: __dxlog_file10,
-          L: 146,
+          L: 155,
           S: this,
           A: [
             "this.currentEpoch",
@@ -1590,19 +1622,18 @@ var DataPipeline = class DataPipeline2 {
     this._isOpen = true;
   }
   async close() {
-    var _a, _b, _c;
     if (!this._isOpen) {
       return;
     }
     (0, import_log9.log)("close", void 0, {
       F: __dxlog_file10,
-      L: 170,
+      L: 179,
       S: this,
       C: (f, a) => f(...a)
     });
     this._isOpen = false;
     await this._ctx.dispose();
-    await ((_a = this._pipeline) == null ? void 0 : _a.stop());
+    await this._pipeline?.stop();
     try {
       await this._saveCache();
       if (this._pipeline) {
@@ -1611,14 +1642,14 @@ var DataPipeline = class DataPipeline2 {
     } catch (err) {
       import_log9.log.catch(err, void 0, {
         F: __dxlog_file10,
-        L: 183,
+        L: 192,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    await ((_b = this.databaseHost) == null ? void 0 : _b.close());
-    await ((_c = this.itemManager) == null ? void 0 : _c.destroy());
-    this._ctx = new import_context5.Context();
+    await this.databaseHost?.close();
+    await this.itemManager?.destroy();
+    this._ctx = new import_context6.Context();
     this._pipeline = void 0;
     this._targetTimeframe = void 0;
     this._lastAutomaticSnapshotTimeframe = new import_timeframe4.Timeframe();
@@ -1635,7 +1666,7 @@ var DataPipeline = class DataPipeline2 {
     }
     (0, import_invariant8.invariant)(this._pipeline, "Pipeline is not initialized.", {
       F: __dxlog_file10,
-      L: 206,
+      L: 215,
       S: this,
       A: [
         "this._pipeline",
@@ -1643,13 +1674,15 @@ var DataPipeline = class DataPipeline2 {
       ]
     });
     for await (const msg of this._pipeline.consume()) {
+      const span = this._usage.beginRecording();
+      this._mutations.inc();
       const { feedKey, seq, data } = msg;
       (0, import_log9.log)("processing message", {
         feedKey,
         seq
       }, {
         F: __dxlog_file10,
-        L: 209,
+        L: 221,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1661,7 +1694,7 @@ var DataPipeline = class DataPipeline2 {
               feedKey
             }, {
               F: __dxlog_file10,
-              L: 215,
+              L: 227,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1684,7 +1717,7 @@ var DataPipeline = class DataPipeline2 {
             spaceKey: this._params.spaceKey.toHex()
           }, {
             F: __dxlog_file10,
-            L: 232,
+            L: 244,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1693,17 +1726,18 @@ var DataPipeline = class DataPipeline2 {
       } catch (err) {
         import_log9.log.catch(err, void 0, {
           F: __dxlog_file10,
-          L: 242,
+          L: 254,
           S: this,
           C: (f, a) => f(...a)
         });
       }
+      span.end();
     }
   }
   _createSnapshot() {
     (0, import_invariant8.invariant)(this.databaseHost, "Database backend is not initialized.", {
       F: __dxlog_file10,
-      L: 248,
+      L: 262,
       S: this,
       A: [
         "this.databaseHost",
@@ -1717,26 +1751,22 @@ var DataPipeline = class DataPipeline2 {
     };
   }
   async _saveTargetTimeframe(timeframe) {
-    var _a;
-    const newTimeframe = import_timeframe4.Timeframe.merge((_a = this._targetTimeframe) != null ? _a : new import_timeframe4.Timeframe(), timeframe);
+    const newTimeframe = import_timeframe4.Timeframe.merge(this._targetTimeframe ?? new import_timeframe4.Timeframe(), timeframe);
     await this._params.metadataStore.setSpaceDataLatestTimeframe(this._params.spaceKey, newTimeframe);
     this._targetTimeframe = newTimeframe;
   }
   async _saveCache() {
-    var _a;
     const cache = {};
     try {
-      const propertiesItem = this.itemManager.items.find((item) => {
-        var _a2, _b;
-        return ((_a2 = item.modelMeta) == null ? void 0 : _a2.type) === "dxos:model/document" && ((_b = (0, import_echo_db3.getStateMachineFromItem)(item)) == null ? void 0 : _b.snapshot()).type === "dxos.sdk.client.Properties";
-      });
+      const propertiesItem = this.itemManager.items.find((item) => item.modelMeta?.type === "dxos:model/document" && // TODO(burdon): Document?
+      ((0, import_echo_db3.getStateMachineFromItem)(item)?.snapshot()).type === import_echo_db3.TYPE_PROPERTIES);
       if (propertiesItem) {
-        cache.properties = (_a = (0, import_echo_db3.getStateMachineFromItem)(propertiesItem)) == null ? void 0 : _a.snapshot();
+        cache.properties = (0, import_echo_db3.getStateMachineFromItem)(propertiesItem)?.snapshot();
       }
     } catch (err) {
       import_log9.log.warn("Failed to cache properties", err, {
         F: __dxlog_file10,
-        L: 277,
+        L: 291,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1753,24 +1783,23 @@ var DataPipeline = class DataPipeline2 {
     }
   }
   async _processEpochInSeparateTask(epoch) {
-    var _a;
     if (epoch.subject.assertion.number <= this._lastProcessedEpoch) {
       return;
     }
-    await ((_a = this._epochCtx) == null ? void 0 : _a.dispose());
-    const ctx = new import_context5.Context({
+    await this._epochCtx?.dispose();
+    const ctx = new import_context6.Context({
       onError: (err) => {
         if (err instanceof import_errors2.CancelledError) {
           (0, import_log9.log)("Epoch processing cancelled.", void 0, {
             F: __dxlog_file10,
-            L: 309,
+            L: 323,
             S: this,
             C: (f, a) => f(...a)
           });
         } else {
           import_log9.log.catch(err, void 0, {
             F: __dxlog_file10,
-            L: 311,
+            L: 325,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1782,14 +1811,6 @@ var DataPipeline = class DataPipeline2 {
       if (!this._isOpen) {
         return;
       }
-      (0, import_log9.log)("process epoch", {
-        epoch
-      }, {
-        F: __dxlog_file10,
-        L: 321,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       await this._processEpoch(ctx, epoch.subject.assertion);
       this.appliedEpoch = epoch;
       this.onNewEpoch.emit(epoch);
@@ -1798,7 +1819,7 @@ var DataPipeline = class DataPipeline2 {
   async _processEpoch(ctx, epoch) {
     (0, import_invariant8.invariant)(this._isOpen, "Space is closed.", {
       F: __dxlog_file10,
-      L: 331,
+      L: 344,
       S: this,
       A: [
         "this._isOpen",
@@ -1807,7 +1828,7 @@ var DataPipeline = class DataPipeline2 {
     });
     (0, import_invariant8.invariant)(this._pipeline, void 0, {
       F: __dxlog_file10,
-      L: 332,
+      L: 345,
       S: this,
       A: [
         "this._pipeline",
@@ -1815,11 +1836,11 @@ var DataPipeline = class DataPipeline2 {
       ]
     });
     this._lastProcessedEpoch = epoch.number;
-    (0, import_log9.log)("Processing epoch", {
-      epoch
+    (0, import_log9.log)("processing", {
+      epoch: (0, import_log9.omit)(epoch, "proof")
     }, {
       F: __dxlog_file10,
-      L: 335,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1827,9 +1848,9 @@ var DataPipeline = class DataPipeline2 {
       const snapshot = await this._params.snapshotManager.load(ctx, epoch.snapshotCid);
       this.databaseHost._itemDemuxer.restoreFromSnapshot(snapshot.database);
     }
-    (0, import_log9.log)("restarting pipeline for epoch", void 0, {
+    (0, import_log9.log)("restarting pipeline from epoch", void 0, {
       F: __dxlog_file10,
-      L: 343,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1840,7 +1861,7 @@ var DataPipeline = class DataPipeline2 {
   async waitUntilTimeframe(timeframe) {
     (0, import_invariant8.invariant)(this._pipeline, "Pipeline is not initialized.", {
       F: __dxlog_file10,
-      L: 351,
+      L: 361,
       S: this,
       A: [
         "this._pipeline",
@@ -1852,7 +1873,7 @@ var DataPipeline = class DataPipeline2 {
   async createEpoch() {
     (0, import_invariant8.invariant)(this._pipeline, void 0, {
       F: __dxlog_file10,
-      L: 357,
+      L: 367,
       S: this,
       A: [
         "this._pipeline",
@@ -1861,7 +1882,7 @@ var DataPipeline = class DataPipeline2 {
     });
     (0, import_invariant8.invariant)(this.currentEpoch, void 0, {
       F: __dxlog_file10,
-      L: 358,
+      L: 368,
       S: this,
       A: [
         "this.currentEpoch",
@@ -1884,24 +1905,31 @@ var DataPipeline = class DataPipeline2 {
     await this.onNewEpoch.waitForCondition(() => !!this.currentEpoch);
   }
 };
-_ts_decorate5([
+_ts_decorate6([
+  import_tracing2.trace.metricsCounter()
+], DataPipeline.prototype, "_usage", void 0);
+_ts_decorate6([
+  import_tracing2.trace.metricsCounter()
+], DataPipeline.prototype, "_mutations", void 0);
+_ts_decorate6([
   import_async6.synchronized
 ], DataPipeline.prototype, "open", null);
-_ts_decorate5([
+_ts_decorate6([
   import_async6.synchronized
 ], DataPipeline.prototype, "close", null);
-_ts_decorate5([
+_ts_decorate6([
   import_async6.synchronized
 ], DataPipeline.prototype, "_processEpoch", null);
-_ts_decorate5([
+_ts_decorate6([
   import_async6.synchronized
 ], DataPipeline.prototype, "createEpoch", null);
-DataPipeline = _ts_decorate5([
-  (0, import_async6.trackLeaks)("open", "close")
+DataPipeline = _ts_decorate6([
+  (0, import_async6.trackLeaks)("open", "close"),
+  import_tracing2.trace.resource()
 ], DataPipeline);
 
 // packages/core/echo/echo-pipeline/src/space/space.ts
-function _ts_decorate6(decorators, target, key, desc) {
+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);
@@ -2004,12 +2032,10 @@ var Space = class Space2 {
     return this._genesisFeedKey;
   }
   get controlFeedKey() {
-    var _a;
-    return (_a = this._controlFeed) == null ? void 0 : _a.key;
+    return this._controlFeed?.key;
   }
   get dataFeedKey() {
-    var _a;
-    return (_a = this._dataFeed) == null ? void 0 : _a.key;
+    return this._dataFeed?.key;
   }
   get spaceState() {
     return this._controlPipeline.spaceState;
@@ -2029,7 +2055,7 @@ var Space = class Space2 {
   setControlFeed(feed) {
     (0, import_invariant9.invariant)(!this._controlFeed, "Control feed already set.", {
       F: __dxlog_file11,
-      L: 183,
+      L: 184,
       S: this,
       A: [
         "!this._controlFeed",
@@ -2041,10 +2067,9 @@ var Space = class Space2 {
     return this;
   }
   setDataFeed(feed) {
-    var _a;
     (0, import_invariant9.invariant)(!this._dataFeed, "Data feed already set.", {
       F: __dxlog_file11,
-      L: 190,
+      L: 191,
       S: this,
       A: [
         "!this._dataFeed",
@@ -2052,7 +2077,7 @@ var Space = class Space2 {
       ]
     });
     this._dataFeed = feed;
-    (_a = this._dataPipeline.pipeline) == null ? void 0 : _a.setWriteFeed(feed);
+    this._dataPipeline.pipeline?.setWriteFeed(feed);
     return this;
   }
   /**
@@ -2070,7 +2095,7 @@ var Space = class Space2 {
   async open(ctx) {
     (0, import_log10.log)("opening...", void 0, {
       F: __dxlog_file11,
-      L: 212,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2083,7 +2108,7 @@ var Space = class Space2 {
     this._isOpen = true;
     (0, import_log10.log)("opened", void 0, {
       F: __dxlog_file11,
-      L: 223,
+      L: 224,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2093,7 +2118,7 @@ var Space = class Space2 {
       key: this._key
     }, {
       F: __dxlog_file11,
-      L: 228,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2107,7 +2132,7 @@ var Space = class Space2 {
     this._isOpen = false;
     (0, import_log10.log)("closed", void 0, {
       F: __dxlog_file11,
-      L: 241,
+      L: 242,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2115,13 +2140,13 @@ var Space = class Space2 {
   async initializeDataPipeline() {
     (0, import_log10.log)("initializeDataPipeline", void 0, {
       F: __dxlog_file11,
-      L: 246,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant9.invariant)(this._isOpen, "Space must be open to initialize data pipeline.", {
       F: __dxlog_file11,
-      L: 247,
+      L: 248,
       S: this,
       A: [
         "this._isOpen",
@@ -2131,22 +2156,23 @@ var Space = class Space2 {
     await this._dataPipeline.open();
   }
 };
-_ts_decorate6([
-  import_log10.logInfo
+_ts_decorate7([
+  import_log10.logInfo,
+  import_tracing3.trace.info()
 ], Space.prototype, "key", null);
-_ts_decorate6([
+_ts_decorate7([
   import_async7.synchronized,
-  import_tracing.trace.span()
+  import_tracing3.trace.span()
 ], Space.prototype, "open", null);
-_ts_decorate6([
+_ts_decorate7([
   import_async7.synchronized
 ], Space.prototype, "close", null);
-_ts_decorate6([
+_ts_decorate7([
   import_async7.synchronized
 ], Space.prototype, "initializeDataPipeline", null);
-Space = _ts_decorate6([
+Space = _ts_decorate7([
   (0, import_async7.trackLeaks)("open", "close"),
-  import_tracing.trace.resource()
+  import_tracing3.trace.resource()
 ], Space);
 
 // packages/core/echo/echo-pipeline/src/space/space-manager.ts
@@ -2166,7 +2192,7 @@ var import_teleport2 = require("@dxos/teleport");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_teleport_extension_replicator = require("@dxos/teleport-extension-replicator");
 var import_util8 = require("@dxos/util");
-function _ts_decorate7(decorators, target, key, desc) {
+function _ts_decorate8(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);
@@ -2207,7 +2233,7 @@ var SpaceProtocol = class {
       key: feed.key
     }, {
       F: __dxlog_file12,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2216,6 +2242,7 @@ var SpaceProtocol = class {
       session.replicator.addFeed(feed);
     }
   }
+  // TODO(burdon): Rename open? Common open/close interfaces for all services?
   async start() {
     if (this._connection) {
       return;
@@ -2229,7 +2256,7 @@ var SpaceProtocol = class {
     await this.blobSync.open();
     (0, import_log11.log)("starting...", void 0, {
       F: __dxlog_file12,
-      L: 120,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2239,11 +2266,11 @@ var SpaceProtocol = class {
       peerId: this._swarmIdentity.peerKey,
       topic,
       topology: new import_network_manager.MMSTTopology(topologyConfig),
-      label: `Protocol swarm: ${topic}`
+      label: `space swarm ${topic.truncate()}`
     });
     (0, import_log11.log)("started", void 0, {
       F: __dxlog_file12,
-      L: 130,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2253,14 +2280,14 @@ var SpaceProtocol = class {
     if (this._connection) {
       (0, import_log11.log)("stopping...", void 0, {
         F: __dxlog_file12,
-        L: 137,
+        L: 139,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._connection.close();
       (0, import_log11.log)("stopped", void 0, {
         F: __dxlog_file12,
-        L: 139,
+        L: 141,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2283,10 +2310,10 @@ var SpaceProtocol = class {
     };
   }
 };
-_ts_decorate7([
+_ts_decorate8([
   import_log11.logInfo
 ], SpaceProtocol.prototype, "_topic", void 0);
-_ts_decorate7([
+_ts_decorate8([
   import_log11.logInfo
 ], SpaceProtocol.prototype, "_ownPeerKey", null);
 var AuthStatus;
@@ -2325,20 +2352,18 @@ var SpaceProtocolSession = class {
       provider: this._swarmIdentity.credentialProvider,
       verifier: this._swarmIdentity.credentialAuthenticator,
       onAuthSuccess: () => {
-        var _a;
         (0, import_log11.log)("Peer authenticated", void 0, {
           F: __dxlog_file12,
-          L: 236,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
         this._authStatus = AuthStatus.SUCCESS;
-        (_a = this._onSessionAuth) == null ? void 0 : _a.call(this, this._teleport);
+        this._onSessionAuth?.(this._teleport);
       },
       onAuthFailure: () => {
-        var _a;
         this._authStatus = AuthStatus.FAILURE;
-        (_a = this._onAuthFailure) == null ? void 0 : _a.call(this, this._teleport);
+        this._onAuthFailure?.(this._teleport);
       }
     }));
     this._teleport.addExtension("dxos.mesh.teleport.replicator", this.replicator);
@@ -2348,15 +2373,15 @@ var SpaceProtocolSession = class {
     await this._teleport.close();
   }
 };
-_ts_decorate7([
+_ts_decorate8([
   import_log11.logInfo
 ], SpaceProtocolSession.prototype, "_wireParams", void 0);
-_ts_decorate7([
+_ts_decorate8([
   import_log11.logInfo
 ], SpaceProtocolSession.prototype, "authStatus", null);
 
 // packages/core/echo/echo-pipeline/src/space/space-manager.ts
-function _ts_decorate8(decorators, target, key, desc) {
+function _ts_decorate9(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);
@@ -2390,7 +2415,6 @@ var SpaceManager = class SpaceManager2 {
     ].map((space) => space.close()));
   }
   async constructSpace({ metadata, swarmIdentity, onNetworkConnection, onAuthFailure, memberKey }) {
-    var _a;
     import_log12.log.trace("dxos.echo.space-manager.construct-space", import_protocols6.trace.begin({
       id: this._instanceId
     }), {
@@ -2407,7 +2431,7 @@ var SpaceManager = class SpaceManager2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    const genesisFeed = await this._feedStore.openFeed((_a = metadata.genesisFeedKey) != null ? _a : (0, import_debug4.failUndefined)());
+    const genesisFeed = await this._feedStore.openFeed(metadata.genesisFeedKey ?? (0, import_debug4.failUndefined)());
     const spaceKey = metadata.key;
     const protocol = new SpaceProtocol({
       topic: spaceKey,
@@ -2433,20 +2457,20 @@ var SpaceManager = class SpaceManager2 {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 125,
+      L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
     return space;
   }
 };
-_ts_decorate8([
+_ts_decorate9([
   import_async8.synchronized
 ], SpaceManager.prototype, "open", null);
-_ts_decorate8([
+_ts_decorate9([
   import_async8.synchronized
 ], SpaceManager.prototype, "close", null);
-SpaceManager = _ts_decorate8([
+SpaceManager = _ts_decorate9([
   (0, import_async8.trackLeaks)("open", "close")
 ], SpaceManager);
 
@@ -2476,10 +2500,10 @@ var WebsocketNetworkManagerProvider = (signalUrl) => () => new import_network_ma
 var TestAgentBuilder = class {
   constructor({ storage, networkManagerProvider } = {}) {
     this._agents = new import_util10.ComplexMap(import_keys7.PublicKey.hash);
-    this._storage = storage != null ? storage : (0, import_random_access_storage.createStorage)({
+    this._storage = storage ?? (0, import_random_access_storage.createStorage)({
       type: import_random_access_storage.StorageType.RAM
     });
-    this._networkManagerProvider = networkManagerProvider != null ? networkManagerProvider : MemoryNetworkManagerProvider(new import_messaging.MemorySignalManagerContext());
+    this._networkManagerProvider = networkManagerProvider ?? MemoryNetworkManagerProvider(new import_messaging.MemorySignalManagerContext());
   }
   async close() {
     return Promise.all(this.agents.map((agent) => agent.close()));
@@ -2501,16 +2525,13 @@ var TestAgentBuilder = class {
 };
 var TestAgent = class {
   get metadataStore() {
-    var _a;
-    return (_a = this._metadataStore) != null ? _a : this._metadataStore = new MetadataStore(this.storage.createDirectory("metadata"));
+    return this._metadataStore ??= new MetadataStore(this.storage.createDirectory("metadata"));
   }
   get snapshotStore() {
-    var _a;
-    return (_a = this._snapshotStore) != null ? _a : this._snapshotStore = new SnapshotStore(this.storage.createDirectory("snapshots"));
+    return this._snapshotStore ??= new SnapshotStore(this.storage.createDirectory("snapshots"));
   }
   get blobStore() {
-    var _a;
-    return (_a = this._blobStore) != null ? _a : this._blobStore = new import_teleport_extension_object_sync2.BlobStore(this.storage.createDirectory("blobs"));
+    return this._blobStore ??= new import_teleport_extension_object_sync2.BlobStore(this.storage.createDirectory("blobs"));
   }
   constructor(_networkManagerProvider, _feedBuilder, identityKey, deviceKey) {
     this._networkManagerProvider = _networkManagerProvider;
@@ -2535,8 +2556,7 @@ var TestAgent = class {
     return this._spaces.get(spaceKey);
   }
   get spaceManager() {
-    var _a;
-    return (_a = this._spaceManager) != null ? _a : this._spaceManager = new SpaceManager({
+    return this._spaceManager ??= new SpaceManager({
       feedStore: this.feedStore,
       networkManager: this._networkManagerProvider(),
       modelFactory: this.modelFactory,
@@ -2556,7 +2576,7 @@ var TestAgent = class {
     const controlFeed = await this.feedStore.openFeed(genesisKey, {
       writable: true
     });
-    const dataFeed = await this.feedStore.openFeed(dataKey != null ? dataKey : await this.keyring.createKey(), {
+    const dataFeed = await this.feedStore.openFeed(dataKey ?? await this.keyring.createKey(), {
       writable: true,
       sparse: true
     });
@@ -2586,7 +2606,7 @@ var TestAgent = class {
     });
     space.setControlFeed(controlFeed);
     space.setDataFeed(dataFeed);
-    await space.open(new import_context6.Context());
+    await space.open(new import_context7.Context());
     this._spaces.set(spaceKey, space);
     return space;
   }
@@ -2601,7 +2621,7 @@ var TestAgent = class {
       networkManager: this._networkManagerProvider(),
       blobStore: this.blobStore,
       onSessionAuth: (session) => {
-        session.addExtension("dxos.mesh.teleport.gossip", (gossip != null ? gossip : this.createGossip()).createExtension({
+        session.addExtension("dxos.mesh.teleport.gossip", (gossip ?? this.createGossip()).createExtension({
           remotePeerId: session.remotePeerId
         }));
       }
@@ -2617,7 +2637,7 @@ var TestAgent = class {
       announceInterval: 30,
       offlineTimeout: 200,
       identityKey: this.identityKey,
-      gossip: gossip != null ? gossip : this.createGossip()
+      gossip: gossip ?? this.createGossip()
     });
   }
   async spaceGenesis(space) {
@@ -2682,9 +2702,8 @@ var createRemoteDatabaseFromDataServiceHost = async (modelFactory, dataServiceHo
   };
 };
 var testLocalDatabase = async (create, check = create) => {
-  var _a;
   const objectId = import_keys8.PublicKey.random().toHex();
-  await ((_a = create.databaseHost.getWriteStream()) == null ? void 0 : _a.write({
+  await create.databaseHost.getWriteStream()?.write({
     batch: {
       objects: [
         {
@@ -2695,7 +2714,7 @@ var testLocalDatabase = async (create, check = create) => {
         }
       ]
     }
-  }));
+  });
   await (0, import_async9.asyncTimeout)(check.databaseHost._itemDemuxer.mutation.waitForCondition(() => check.itemManager.entities.has(objectId)), 2e3);
 };
 // Annotate the CommonJS export names for ESM import in node: