@dxos/echo-pipeline 0.4.9-main.2d20855 → 0.4.9-main.2f03cf8

package/dist/lib/browser/{chunk-WAN2XUWE.mjs → chunk-RTEEJ723.mjs}

@@ -40,257 +40,6 @@ var createMappedFeedWriter = (mapper, writer) => {
   };
 };
 
-// packages/core/echo/echo-pipeline/src/db-host/data-service-host.ts
-import { UpdateScheduler } from "@dxos/async";
-import { Stream } from "@dxos/codec-protobuf";
-import { Context } from "@dxos/context";
-import { tagMutationsInBatch, setMetadataOnObject } from "@dxos/echo-db";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { log } from "@dxos/log";
-import { EchoEvent } from "@dxos/protocols/proto/dxos/echo/service";
-import { ComplexMap } from "@dxos/util";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service-host.ts";
-var MUTATION_LIMIT_PER_OBJECT = 10;
-var DataServiceHost = class {
-  constructor(_itemManager, _itemDemuxer, _flush, _writeStream, _opts = {}) {
-    this._itemManager = _itemManager;
-    this._itemDemuxer = _itemDemuxer;
-    this._flush = _flush;
-    this._writeStream = _writeStream;
-    this._opts = _opts;
-    this._ctx = new Context();
-    this._clientTagMap = new ComplexMap(([feedKey, seq]) => `${feedKey.toHex()}:${seq}`);
-  }
-  async open() {
-  }
-  async close() {
-    await this._ctx.dispose();
-  }
-  get _deferEvents() {
-    return this._opts.deferEvents ?? true;
-  }
-  /**
-  * Real-time subscription to data objects in a space.
-  */
-  subscribe() {
-    return new Stream(({ next, close, ctx }) => {
-      ctx.onDispose(this._ctx.onDispose(close));
-      const objects = Array.from(this._itemManager.entities.values()).map((entity) => entity.createSnapshot());
-      next({
-        batch: {
-          objects
-        }
-      });
-      const updateScheduler = new UpdateScheduler(ctx, async () => {
-        flushPendingUpdate();
-      }, {
-        maxFrequency: 10
-      });
-      const pendingUpdates = [];
-      const mutationsPerObject = /* @__PURE__ */ new Map();
-      const clearPendingUpdates = () => {
-        pendingUpdates.length = 0;
-        mutationsPerObject.clear();
-      };
-      const flushPendingUpdate = () => {
-        const stagedEvents = [];
-        const objectsWithSnapshots = /* @__PURE__ */ new Set();
-        for (const [id, count] of mutationsPerObject) {
-          if (count >= MUTATION_LIMIT_PER_OBJECT) {
-            objectsWithSnapshots.add(id);
-            const entity = this._itemManager.entities.get(id);
-            if (entity) {
-              stagedEvents.push(entity.createSnapshot());
-            }
-          }
-        }
-        for (const obj of pendingUpdates) {
-          if (!objectsWithSnapshots.has(obj.objectId)) {
-            stagedEvents.push(obj);
-          }
-        }
-        next({
-          batch: {
-            objects: stagedEvents
-          }
-        });
-        clearPendingUpdates();
-      };
-      this._itemDemuxer.snapshot.on(ctx, (snapshot) => {
-        clearPendingUpdates();
-        next({
-          action: EchoEvent.DatabaseAction.RESET,
-          batch: {
-            objects: snapshot.items
-          }
-        });
-      });
-      this._itemDemuxer.mutation.on(ctx, (message) => {
-        const { batch, meta } = message;
-        invariant2(!meta.clientTag, "Unexpected client tag in mutation message", {
-          F: __dxlog_file2,
-          L: 138,
-          S: this,
-          A: [
-            "!(meta as any).clientTag",
-            "'Unexpected client tag in mutation message'"
-          ]
-        });
-        log("message", {
-          batch: batch.objects?.length,
-          meta
-        }, {
-          F: __dxlog_file2,
-          L: 139,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        const clientTag = this._clientTagMap.get([
-          message.meta.feedKey,
-          message.meta.seq
-        ]);
-        batch.objects?.forEach((object) => {
-          setMetadataOnObject(object, {
-            ...meta
-          });
-        });
-        if (clientTag) {
-          flushPendingUpdate();
-          tagMutationsInBatch(batch, clientTag, 0);
-          next({
-            clientTag,
-            feedKey: message.meta.feedKey,
-            seq: message.meta.seq,
-            batch
-          });
-        } else {
-          for (const obj of batch.objects ?? []) {
-            const newCount = (mutationsPerObject.get(obj.objectId) ?? 0) + 1;
-            mutationsPerObject.set(obj.objectId, newCount);
-          }
-          for (const obj of batch.objects ?? []) {
-            if ((mutationsPerObject.get(obj.objectId) ?? 0) < MUTATION_LIMIT_PER_OBJECT) {
-              pendingUpdates.push(obj);
-            }
-          }
-          if (this._deferEvents) {
-            updateScheduler.trigger();
-          } else {
-            flushPendingUpdate();
-          }
-        }
-      });
-    });
-  }
-  async write(request) {
-    invariant2(!this._ctx.disposed, "Cannot write to closed DataServiceHost", {
-      F: __dxlog_file2,
-      L: 184,
-      S: this,
-      A: [
-        "!this._ctx.disposed",
-        "'Cannot write to closed DataServiceHost'"
-      ]
-    });
-    invariant2(this._writeStream, "Cannot write mutations in readonly mode", {
-      F: __dxlog_file2,
-      L: 185,
-      S: this,
-      A: [
-        "this._writeStream",
-        "'Cannot write mutations in readonly mode'"
-      ]
-    });
-    log("write", {
-      clientTag: request.clientTag,
-      objectCount: request.batch.objects?.length ?? 0
-    }, {
-      F: __dxlog_file2,
-      L: 187,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    const message = createDataMessage(request.batch);
-    const receipt = await this._writeStream.write(message, {
-      afterWrite: async (receipt2) => {
-        if (request.clientTag) {
-          log("tag", {
-            clientTag: request.clientTag,
-            feedKey: receipt2.feedKey,
-            seq: receipt2.seq
-          }, {
-            F: __dxlog_file2,
-            L: 196,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          this._clientTagMap.set([
-            receipt2.feedKey,
-            receipt2.seq
-          ], request.clientTag);
-        }
-      }
-    });
-    return receipt;
-  }
-  async flush() {
-    await this._flush();
-  }
-  getHostInfo() {
-    throw new Error("Method not implemented.");
-  }
-  syncRepo(request) {
-    throw new Error("Method not implemented.");
-  }
-  sendSyncMessage(request) {
-    throw new Error("Method not implemented.");
-  }
-};
-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
-import { ItemDemuxer } from "@dxos/echo-db";
-var DatabaseHost = class {
-  constructor(_outboundStream, _flush) {
-    this._outboundStream = _outboundStream;
-    this._flush = _flush;
-  }
-  get isReadOnly() {
-    return !!this._outboundStream;
-  }
-  get echoProcessor() {
-    return this._echoProcessor;
-  }
-  async open(itemManager, modelFactory) {
-    this._itemManager = itemManager;
-    this._itemManager._debugLabel = "host";
-    this._itemDemuxer = new ItemDemuxer(itemManager, modelFactory);
-    this._echoProcessor = this._itemDemuxer.open();
-  }
-  async close() {
-  }
-  getWriteStream() {
-    return this._outboundStream;
-  }
-  createSnapshot() {
-    return this._itemDemuxer.createSnapshot();
-  }
-  createDataServiceHost(opts = {}) {
-    return new DataServiceHost(this._itemManager, this._itemDemuxer, this._flush, this._outboundStream ?? void 0, opts);
-  }
-};
-
 // packages/core/echo/echo-pipeline/src/db-host/snapshot-manager.ts
 import { cancelWithContext } from "@dxos/context";
 import { PublicKey } from "@dxos/keys";
@@ -373,109 +122,17 @@ var SnapshotStore = class {
 };
 
 // packages/core/echo/echo-pipeline/src/db-host/data-service.ts
-import { raise } from "@dxos/debug";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log2 } from "@dxos/log";
-import { ComplexMap as ComplexMap2 } from "@dxos/util";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
-var DataServiceSubscriptions = class {
-  constructor() {
-    this._spaces = new ComplexMap2(PublicKey2.hash);
-  }
-  clear() {
-    this._spaces.clear();
-  }
-  async registerSpace(spaceKey, host) {
-    log2("Registering space", {
-      spaceKey
-    }, {
-      F: __dxlog_file3,
-      L: 35,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant3(!this._spaces.has(spaceKey), void 0, {
-      F: __dxlog_file3,
-      L: 36,
-      S: this,
-      A: [
-        "!this._spaces.has(spaceKey)",
-        ""
-      ]
-    });
-    await host.open();
-    this._spaces.set(spaceKey, host);
-  }
-  async unregisterSpace(spaceKey) {
-    log2("Unregistering space", {
-      spaceKey
-    }, {
-      F: __dxlog_file3,
-      L: 42,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    const host = this._spaces.get(spaceKey);
-    await host?.close();
-    this._spaces.delete(spaceKey);
-  }
-  getDataService(spaceKey) {
-    return this._spaces.get(spaceKey);
-  }
-};
 var DataServiceImpl = class {
-  constructor(_subscriptions, _automergeHost) {
-    this._subscriptions = _subscriptions;
+  constructor(_automergeHost) {
     this._automergeHost = _automergeHost;
   }
   subscribe(request) {
-    invariant3(request.spaceKey, void 0, {
-      F: __dxlog_file3,
-      L: 64,
-      S: this,
-      A: [
-        "request.spaceKey",
-        ""
-      ]
-    });
-    const host = this._subscriptions.getDataService(request.spaceKey) ?? raise(new Error(`space not found: ${request.spaceKey}`));
-    return host.subscribe();
+    throw new Error("Deprecated.");
   }
   write(request) {
-    invariant3(request.spaceKey, void 0, {
-      F: __dxlog_file3,
-      L: 71,
-      S: this,
-      A: [
-        "request.spaceKey",
-        ""
-      ]
-    });
-    invariant3(request.batch, void 0, {
-      F: __dxlog_file3,
-      L: 72,
-      S: this,
-      A: [
-        "request.batch",
-        ""
-      ]
-    });
-    const host = this._subscriptions.getDataService(request.spaceKey) ?? raise(new Error(`space not found: ${request.spaceKey}`));
-    return host.write(request);
+    throw new Error("Deprecated.");
   }
-  flush(request) {
-    invariant3(request.spaceKey, void 0, {
-      F: __dxlog_file3,
-      L: 79,
-      S: this,
-      A: [
-        "request.spaceKey",
-        ""
-      ]
-    });
-    const host = this._subscriptions.getDataService(request.spaceKey) ?? raise(new Error(`space not found: ${request.spaceKey}`));
-    return host.flush();
+  async flush(request) {
   }
   // Automerge specific.
   async getHostInfo(request) {
@@ -492,13 +149,13 @@ var DataServiceImpl = class {
 // packages/core/echo/echo-pipeline/src/metadata/metadata-store.ts
 import CRC32 from "crc-32";
 import { Event, scheduleTaskInterval, synchronized } from "@dxos/async";
-import { Context as Context2 } from "@dxos/context";
-import { invariant as invariant4 } from "@dxos/invariant";
-import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
+import { Context } from "@dxos/context";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { PublicKey as PublicKey2 } from "@dxos/keys";
+import { log } from "@dxos/log";
 import { DataCorruptionError, STORAGE_VERSION, schema as schema4 } from "@dxos/protocols";
 import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
-import { ComplexMap as ComplexMap3, arrayToBuffer, forEachAsync, isNotNullOrUndefined } from "@dxos/util";
+import { ComplexMap, arrayToBuffer, forEachAsync, isNotNullOrUndefined } from "@dxos/util";
 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")
@@ -509,7 +166,7 @@ function _ts_decorate(decorators, target, key, desc) {
         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_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/metadata/metadata-store.ts";
+var __dxlog_file2 = "/home/runner/work/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,
@@ -523,10 +180,10 @@ var LargeSpaceMetadata = schema4.getCodecForType("dxos.echo.metadata.LargeSpaceM
 var MetadataStore = class {
   constructor(directory) {
     this._metadata = emptyEchoMetadata();
-    this._spaceLargeMetadata = new ComplexMap3(PublicKey3.hash);
+    this._spaceLargeMetadata = new ComplexMap(PublicKey2.hash);
     this._metadataFile = void 0;
     this.update = new Event();
-    this._invitationCleanupCtx = new Context2();
+    this._invitationCleanupCtx = new Context();
     this._directory = directory;
   }
   get metadata() {
@@ -550,12 +207,12 @@ var MetadataStore = class {
       }
       const dataSize = fromBytesInt32(await file.read(0, 4));
       const checksum = fromBytesInt32(await file.read(4, 4));
-      log3("loaded", {
+      log("loaded", {
         size: dataSize,
         checksum,
         name: file.filename
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file2,
         L: 89,
         S: this,
         C: (f, a) => f(...a)
@@ -587,11 +244,11 @@ var MetadataStore = class {
     result.writeInt32LE(checksum, 4);
     encoded.copy(result, 8);
     await file.write(0, result);
-    log3("saved", {
+    log("saved", {
       size: encoded.length,
       checksum
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file2,
       L: 124,
       S: this,
       C: (f, a) => f(...a)
@@ -621,10 +278,10 @@ var MetadataStore = class {
         space.state ??= SpaceState.ACTIVE;
       });
     } catch (err) {
-      log3.error("failed to load metadata", {
+      log.error("failed to load metadata", {
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file2,
         L: 156,
         S: this,
         C: (f, a) => f(...a)
@@ -638,10 +295,10 @@ var MetadataStore = class {
       try {
         await this._loadSpaceLargeMetadata(key);
       } catch (err) {
-        log3.error("failed to load space large metadata", {
+        log.error("failed to load space large metadata", {
           err
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file2,
           L: 168,
           S: this,
           C: (f, a) => f(...a)
@@ -675,10 +332,10 @@ var MetadataStore = class {
         this._spaceLargeMetadata.set(key, metadata);
       }
     } catch (err) {
-      log3.error("failed to load space large metadata", {
+      log.error("failed to load space large metadata", {
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file2,
         L: 215,
         S: this,
         C: (f, a) => f(...a)
@@ -698,8 +355,8 @@ var MetadataStore = class {
       return this._metadata.identity.haloSpace;
     }
     const space = this.spaces.find((space2) => space2.key === spaceKey);
-    invariant4(space, "Space not found", {
-      F: __dxlog_file4,
+    invariant2(space, "Space not found", {
+      F: __dxlog_file2,
       L: 237,
       S: this,
       A: [
@@ -722,8 +379,8 @@ var MetadataStore = class {
   * Clears storage - doesn't work for now.
   */
   async clear() {
-    log3("clearing all metadata", void 0, {
-      F: __dxlog_file4,
+    log("clearing all metadata", void 0, {
+      F: __dxlog_file2,
       L: 256,
       S: this,
       C: (f, a) => f(...a)
@@ -735,8 +392,8 @@ var MetadataStore = class {
     return this._metadata.identity;
   }
   async setIdentityRecord(record) {
-    invariant4(!this._metadata.identity, "Cannot overwrite existing identity in metadata", {
-      F: __dxlog_file4,
+    invariant2(!this._metadata.identity, "Cannot overwrite existing identity in metadata", {
+      F: __dxlog_file2,
       L: 266,
       S: this,
       A: [
@@ -765,8 +422,8 @@ var MetadataStore = class {
     await this.flush();
   }
   async addSpace(record) {
-    invariant4(!(this._metadata.spaces ?? []).find((space) => space.key === record.key), "Cannot overwrite existing space in metadata", {
-      F: __dxlog_file4,
+    invariant2(!(this._metadata.spaces ?? []).find((space) => space.key === record.key), "Cannot overwrite existing space in metadata", {
+      F: __dxlog_file2,
       L: 294,
       S: this,
       A: [
@@ -826,7 +483,7 @@ var fromBytesInt32 = (buf) => buf.readInt32LE(0);
 // packages/core/echo/echo-pipeline/src/pipeline/timeframe-clock.ts
 import { Event as Event2 } from "@dxos/async";
 import { timed } from "@dxos/debug";
-import { log as log4 } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { Timeframe } from "@dxos/timeframe";
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -838,7 +495,7 @@ function _ts_decorate2(decorators, target, key, desc) {
         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 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/timeframe-clock.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/timeframe-clock.ts";
 var mapTimeframeToFeedIndexes = (timeframe) => timeframe.frames().map(([feedKey, index]) => ({
   feedKey,
   index
@@ -892,22 +549,22 @@ var TimeframeClock = class {
     return !gaps.isEmpty();
   }
   async waitUntilReached(target) {
-    log4("waitUntilReached", {
+    log2("waitUntilReached", {
       target,
       current: this._timeframe
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file3,
       L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.update.waitForCondition(() => {
-      log4("check if reached", {
+      log2("check if reached", {
         target,
         current: this._timeframe,
         deps: Timeframe.dependencies(target, this._timeframe)
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file3,
         L: 72,
         S: this,
         C: (f, a) => f(...a)
@@ -922,25 +579,25 @@ _ts_decorate2([
 
 // packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts
 import { Event as Event3, sleepWithContext, synchronized as synchronized2, Trigger } from "@dxos/async";
-import { Context as Context3, rejectOnDispose } from "@dxos/context";
+import { Context as Context2, rejectOnDispose } from "@dxos/context";
 import { failUndefined } from "@dxos/debug";
 import { FeedSetIterator } from "@dxos/feed-store";
-import { invariant as invariant6 } from "@dxos/invariant";
-import { PublicKey as PublicKey4 } from "@dxos/keys";
-import { log as log6 } from "@dxos/log";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { PublicKey as PublicKey3 } from "@dxos/keys";
+import { log as log4 } from "@dxos/log";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
-import { ComplexMap as ComplexMap4 } from "@dxos/util";
+import { ComplexMap as ComplexMap2 } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/pipeline/message-selector.ts
-import { invariant as invariant5 } from "@dxos/invariant";
-import { log as log5 } from "@dxos/log";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/message-selector.ts";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { log as log3 } from "@dxos/log";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/message-selector.ts";
 var createMessageSelector = (timeframeClock) => {
   return (messages) => {
     for (let i = 0; i < messages.length; i++) {
       const { data: { timeframe } } = messages[i];
-      invariant5(timeframe, void 0, {
-        F: __dxlog_file6,
+      invariant3(timeframe, void 0, {
+        F: __dxlog_file4,
         L: 25,
         S: void 0,
         A: [
@@ -952,8 +609,8 @@ var createMessageSelector = (timeframeClock) => {
         return i;
       }
     }
-    log5("Skipping...", void 0, {
-      F: __dxlog_file6,
+    log3("Skipping...", void 0, {
+      F: __dxlog_file4,
       L: 33,
       S: void 0,
       C: (f, a) => f(...a)
@@ -972,12 +629,12 @@ function _ts_decorate3(decorators, target, key, desc) {
         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 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts";
 var PipelineState = class {
   constructor(_feeds, _timeframeClock) {
     this._feeds = _feeds;
     this._timeframeClock = _timeframeClock;
-    this._ctx = new Context3();
+    this._ctx = new Context2();
     this.timeframeUpdate = this._timeframeClock.update;
     this.stalled = new Event3();
     this._startTimeframe = new Timeframe2();
@@ -1025,13 +682,13 @@ var PipelineState = class {
   *
   * @param timeout Timeout in milliseconds to specify the maximum wait time.
   */
-  async waitUntilReachedTargetTimeframe({ ctx = new Context3(), timeout, breakOnStall = true } = {}) {
-    log6("waitUntilReachedTargetTimeframe", {
+  async waitUntilReachedTargetTimeframe({ ctx = new Context2(), timeout, breakOnStall = true } = {}) {
+    log4("waitUntilReachedTargetTimeframe", {
       timeout,
       current: this.timeframe,
       target: this.targetTimeframe
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file5,
       L: 133,
       S: this,
       C: (f, a) => f(...a)
@@ -1057,13 +714,13 @@ var PipelineState = class {
           if (done) {
             return;
           }
-          log6.warn("waitUntilReachedTargetTimeframe timed out", {
+          log4.warn("waitUntilReachedTargetTimeframe timed out", {
             timeout,
             current: this.timeframe,
             target: this.targetTimeframe,
             dependencies: Timeframe2.dependencies(this.targetTimeframe, this.timeframe)
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file5,
             L: 161,
             S: this,
             C: (f, a) => f(...a)
@@ -1078,14 +735,14 @@ var PipelineState = class {
 var Pipeline = class {
   constructor() {
     this._timeframeClock = new TimeframeClock(new Timeframe2());
-    this._feeds = new ComplexMap4(PublicKey4.hash);
+    this._feeds = new ComplexMap2(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 ComplexMap4((value) => PublicKey4.hash(value.key));
+    this._downloads = new ComplexMap2((value) => PublicKey3.hash(value.key));
     this._isStopping = false;
     this._isStarted = false;
     this._isBeingConsumed = false;
@@ -1095,8 +752,8 @@ var Pipeline = class {
     return this._state;
   }
   get writer() {
-    invariant6(this._writer, "Writer not set.", {
-      F: __dxlog_file7,
+    invariant4(this._writer, "Writer not set.", {
+      F: __dxlog_file5,
       L: 242,
       S: this,
       A: [
@@ -1124,8 +781,8 @@ var Pipeline = class {
     }
   }
   setWriteFeed(feed) {
-    invariant6(!this._writer, "Writer already set.", {
-      F: __dxlog_file7,
+    invariant4(!this._writer, "Writer already set.", {
+      F: __dxlog_file5,
       L: 269,
       S: this,
       A: [
@@ -1133,8 +790,8 @@ var Pipeline = class {
         "'Writer already set.'"
       ]
     });
-    invariant6(feed.properties.writable, "Feed must be writable.", {
-      F: __dxlog_file7,
+    invariant4(feed.properties.writable, "Feed must be writable.", {
+      F: __dxlog_file5,
       L: 270,
       S: this,
       A: [
@@ -1148,8 +805,8 @@ var Pipeline = class {
     }), feed.createFeedWriter());
   }
   async start() {
-    invariant6(!this._isStarted, "Pipeline is already started.", {
-      F: __dxlog_file7,
+    invariant4(!this._isStarted, "Pipeline is already started.", {
+      F: __dxlog_file5,
       L: 283,
       S: this,
       A: [
@@ -1157,8 +814,8 @@ var Pipeline = class {
         "'Pipeline is already started.'"
       ]
     });
-    log6("starting...", void 0, {
-      F: __dxlog_file7,
+    log4("starting...", void 0, {
+      F: __dxlog_file5,
       L: 284,
       S: this,
       C: (f, a) => f(...a)
@@ -1166,8 +823,8 @@ var Pipeline = class {
     await this._initIterator();
     await this._feedSetIterator.open();
     this._isStarted = true;
-    log6("started", void 0, {
-      F: __dxlog_file7,
+    log4("started", void 0, {
+      F: __dxlog_file5,
       L: 288,
       S: this,
       C: (f, a) => f(...a)
@@ -1179,8 +836,8 @@ var Pipeline = class {
     }
   }
   async stop() {
-    log6("stopping...", void 0, {
-      F: __dxlog_file7,
+    log4("stopping...", void 0, {
+      F: __dxlog_file5,
       L: 299,
       S: this,
       C: (f, a) => f(...a)
@@ -1193,12 +850,12 @@ var Pipeline = class {
     await this._feedSetIterator?.close();
     await this._processingTrigger.wait();
     await this._state._ctx.dispose();
-    this._state._ctx = new Context3();
+    this._state._ctx = new Context2();
     this._state._reachedTargetPromise = void 0;
     this._state._reachedTarget = false;
     this._isStarted = false;
-    log6("stopped", void 0, {
-      F: __dxlog_file7,
+    log4("stopped", void 0, {
+      F: __dxlog_file5,
       L: 312,
       S: this,
       C: (f, a) => f(...a)
@@ -1209,8 +866,8 @@ var Pipeline = class {
   *  The pipeline will start processing messages AFTER this timeframe.
   */
   async setCursor(timeframe) {
-    invariant6(!this._isStarted || this._isPaused, "Invalid state.", {
-      F: __dxlog_file7,
+    invariant4(!this._isStarted || this._isPaused, "Invalid state.", {
+      F: __dxlog_file5,
       L: 321,
       S: this,
       A: [
@@ -1238,8 +895,8 @@ var Pipeline = class {
     this._isPaused = true;
   }
   async unpause() {
-    invariant6(this._isPaused, "Pipeline is not paused.", {
-      F: __dxlog_file7,
+    invariant4(this._isPaused, "Pipeline is not paused.", {
+      F: __dxlog_file5,
       L: 350,
       S: this,
       A: [
@@ -1258,8 +915,8 @@ var Pipeline = class {
   * Updates the timeframe clock after the message has bee processed.
   */
   async *consume() {
-    invariant6(!this._isBeingConsumed, "Pipeline is already being consumed.", {
-      F: __dxlog_file7,
+    invariant4(!this._isBeingConsumed, "Pipeline is already being consumed.", {
+      F: __dxlog_file5,
       L: 365,
       S: this,
       A: [
@@ -1268,8 +925,8 @@ var Pipeline = class {
       ]
     });
     this._isBeingConsumed = true;
-    invariant6(this._feedSetIterator, "Iterator not initialized.", {
-      F: __dxlog_file7,
+    invariant4(this._feedSetIterator, "Iterator not initialized.", {
+      F: __dxlog_file5,
       L: 368,
       S: this,
       A: [
@@ -1282,8 +939,8 @@ var Pipeline = class {
     while (!this._isStopping) {
       await this._pauseTrigger.wait();
       if (lastFeedSetIterator !== this._feedSetIterator) {
-        invariant6(this._feedSetIterator, "Iterator not initialized.", {
-          F: __dxlog_file7,
+        invariant4(this._feedSetIterator, "Iterator not initialized.", {
+          F: __dxlog_file5,
           L: 377,
           S: this,
           A: [
@@ -1298,7 +955,7 @@ var Pipeline = class {
       if (!done) {
         const block = value ?? failUndefined();
         this._processingTrigger.reset();
-        this._timeframeClock.updatePendingTimeframe(PublicKey4.from(block.feedKey), block.seq);
+        this._timeframeClock.updatePendingTimeframe(PublicKey3.from(block.feedKey), block.seq);
         yield block;
         this._processingTrigger.wake();
         this._timeframeClock.updateTimeframe();
@@ -1313,12 +970,12 @@ var Pipeline = class {
     }
     const timeframe = this._state._startTimeframe;
     const seq = timeframe.get(feed.key) ?? -1;
-    log6("download", {
+    log4("download", {
       feed: feed.key.truncate(),
       seq,
       length: feed.length
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file5,
       L: 406,
       S: this,
       C: (f, a) => f(...a)
@@ -1329,10 +986,10 @@ var Pipeline = class {
     }, (err, data) => {
       if (err) {
       } else {
-        log6.info("downloaded", {
+        log4.info("downloaded", {
           data
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file5,
           L: 411,
           S: this,
           C: (f, a) => f(...a)
@@ -1347,8 +1004,8 @@ var Pipeline = class {
       stallTimeout: 1e3
     });
     this._feedSetIterator.stalled.on((iterator) => {
-      log6.warn(`Stalled after ${iterator.options.stallTimeout}ms with ${iterator.size} feeds.`, void 0, {
-        F: __dxlog_file7,
+      log4.warn(`Stalled after ${iterator.options.stallTimeout}ms with ${iterator.size} feeds.`, void 0, {
+        F: __dxlog_file5,
         L: 425,
         S: this,
         C: (f, a) => f(...a)
@@ -1378,13 +1035,13 @@ _ts_decorate3([
 
 // packages/core/echo/echo-pipeline/src/space/auth.ts
 import { runInContext, scheduleTask } from "@dxos/async";
-import { Context as Context4 } from "@dxos/context";
+import { Context as Context3 } from "@dxos/context";
 import { randomBytes } from "@dxos/crypto";
-import { invariant as invariant7 } from "@dxos/invariant";
-import { log as log7 } from "@dxos/log";
+import { invariant as invariant5 } from "@dxos/invariant";
+import { log as log5 } from "@dxos/log";
 import { schema as schema5 } from "@dxos/protocols";
 import { RpcExtension } from "@dxos/teleport";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/auth.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/auth.ts";
 var AuthExtension = class extends RpcExtension {
   constructor(_authParams) {
     super({
@@ -1397,10 +1054,10 @@ var AuthExtension = class extends RpcExtension {
       timeout: 60 * 1e3
     });
     this._authParams = _authParams;
-    this._ctx = new Context4({
+    this._ctx = new Context3({
       onError: (err) => {
-        log7.catch(err, void 0, {
-          F: __dxlog_file8,
+        log5.catch(err, void 0, {
+          F: __dxlog_file6,
           L: 28,
           S: this,
           C: (f, a) => f(...a)
@@ -1421,8 +1078,8 @@ var AuthExtension = class extends RpcExtension {
               credential
             };
           } catch (err) {
-            log7.error("failed to generate auth credentials", err, {
-              F: __dxlog_file8,
+            log5.error("failed to generate auth credentials", err, {
+              F: __dxlog_file6,
               L: 55,
               S: this,
               C: (f, a) => f(...a)
@@ -1441,8 +1098,8 @@ var AuthExtension = class extends RpcExtension {
         const { credential } = await this.rpc.AuthService.authenticate({
           challenge
         });
-        invariant7(credential?.length > 0, "invalid credential", {
-          F: __dxlog_file8,
+        invariant5(credential?.length > 0, "invalid credential", {
+          F: __dxlog_file6,
           L: 69,
           S: this,
           A: [
@@ -1451,8 +1108,8 @@ var AuthExtension = class extends RpcExtension {
           ]
         });
         const success = await this._authParams.verifier(challenge, credential);
-        invariant7(success, "credential not verified", {
-          F: __dxlog_file8,
+        invariant5(success, "credential not verified", {
+          F: __dxlog_file6,
           L: 71,
           S: this,
           A: [
@@ -1462,8 +1119,8 @@ var AuthExtension = class extends RpcExtension {
         });
         runInContext(this._ctx, () => this._authParams.onAuthSuccess());
       } catch (err) {
-        log7("auth failed", err, {
-          F: __dxlog_file8,
+        log5("auth failed", err, {
+          F: __dxlog_file6,
           L: 74,
           S: this,
           C: (f, a) => f(...a)
@@ -1483,17 +1140,24 @@ var AuthExtension = class extends RpcExtension {
   }
 };
 
-// packages/core/echo/echo-pipeline/src/space/data-pipeline.ts
-import { Event as Event4, scheduleTask as scheduleTask2, sleep, synchronized as synchronized3, trackLeaks } from "@dxos/async";
-import { Context as Context5 } from "@dxos/context";
-import { checkCredentialType } from "@dxos/credentials";
-import { ItemManager } from "@dxos/echo-db";
-import { invariant as invariant8 } from "@dxos/invariant";
-import { log as log8, omit } from "@dxos/log";
-import { CancelledError } from "@dxos/protocols";
+// packages/core/echo/echo-pipeline/src/space/space.ts
+import { Event as Event4, Mutex, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { invariant as invariant6 } from "@dxos/invariant";
+import { log as log7, logInfo } from "@dxos/log";
+import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { trace as trace2 } from "@dxos/tracing";
+import { Callback as Callback2 } from "@dxos/util";
+
+// packages/core/echo/echo-pipeline/src/space/control-pipeline.ts
+import { DeferredTask, 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";
+import { log as log6 } from "@dxos/log";
+import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 import { TimeSeriesCounter, TimeUsageCounter, trace } from "@dxos/tracing";
-import { tracer } from "@dxos/util";
+import { Callback, tracer } from "@dxos/util";
 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")
@@ -1504,467 +1168,17 @@ function _ts_decorate4(decorators, target, key, desc) {
         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/data-pipeline.ts";
-var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL = 5e3;
-var DataPipeline = class {
-  constructor(_params) {
-    this._params = _params;
-    this._ctx = new Context5();
-    this._pipeline = void 0;
-    this._targetTimeframe = void 0;
-    this._lastAutomaticSnapshotTimeframe = new Timeframe3();
-    this._isOpen = false;
-    this._lastTimeframeSaveTime = 0;
-    this._lastSnapshotSaveTime = 0;
-    this._lastProcessedEpoch = -1;
+var __dxlog_file7 = "/home/runner/work/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 {
+  constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
+    this._ctx = new Context4();
+    this._lastTimeframeSaveTime = Date.now();
+    this.onFeedAdmitted = new Callback();
     this._usage = new TimeUsageCounter();
     this._mutations = new TimeSeriesCounter();
-    this.currentEpoch = void 0;
-    this.appliedEpoch = void 0;
-    this.onNewEpoch = new Event4();
-  }
-  get isOpen() {
-    return this._isOpen;
-  }
-  get pipeline() {
-    return this._pipeline;
-  }
-  get pipelineState() {
-    return this._pipeline?.state;
-  }
-  setTargetTimeframe(timeframe) {
-    this._targetTimeframe = timeframe;
-    this._pipeline?.state.setTargetTimeframe(timeframe);
-  }
-  async processCredential(credential) {
-    if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
-      return;
-    }
-    this.currentEpoch = credential;
-    if (this._isOpen) {
-      await this._processEpochInSeparateTask(credential);
-    }
-  }
-  async open() {
-    if (this._isOpen) {
-      return;
-    }
-    this._pipeline = new Pipeline();
-    await this._params.onPipelineCreated(this._pipeline);
-    await this._pipeline.pause();
-    await this._pipeline.start();
-    if (this._targetTimeframe) {
-      this._pipeline.state.setTargetTimeframe(this._targetTimeframe);
-    }
-    const feedWriter = {
-      write: (data, options) => {
-        invariant8(this._pipeline, "Pipeline is not initialized.", {
-          F: __dxlog_file9,
-          L: 152,
-          S: this,
-          A: [
-            "this._pipeline",
-            "'Pipeline is not initialized.'"
-          ]
-        });
-        invariant8(this.currentEpoch, "Epoch is not initialized.", {
-          F: __dxlog_file9,
-          L: 153,
-          S: this,
-          A: [
-            "this.currentEpoch",
-            "'Epoch is not initialized.'"
-          ]
-        });
-        return this._pipeline.writer.write({
-          data
-        }, options);
-      }
-    };
-    this.databaseHost = new DatabaseHost(feedWriter, () => this._flush());
-    this.itemManager = new ItemManager(this._params.modelFactory);
-    await this.databaseHost.open(this.itemManager, this._params.modelFactory);
-    scheduleTask2(this._ctx, async () => {
-      await this._consumePipeline();
-    });
-    this._isOpen = true;
-  }
-  async close() {
-    if (!this._isOpen) {
-      return;
-    }
-    log8("close", void 0, {
-      F: __dxlog_file9,
-      L: 177,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._isOpen = false;
-    await this._ctx.dispose();
-    await this._pipeline?.stop();
-    try {
-      if (this._pipeline) {
-        await this._saveTargetTimeframe(this._pipeline.state.timeframe);
-      }
-    } catch (err) {
-      log8.catch(err, void 0, {
-        F: __dxlog_file9,
-        L: 189,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-    await this.databaseHost?.close();
-    await this.itemManager?.destroy();
-    this._ctx = new Context5();
-    this._pipeline = void 0;
-    this._targetTimeframe = void 0;
-    this._lastAutomaticSnapshotTimeframe = new Timeframe3();
-    this.currentEpoch = void 0;
-    this.appliedEpoch = void 0;
-    this._lastProcessedEpoch = -1;
-    this._epochCtx = void 0;
-  }
-  async _consumePipeline() {
-    const pipeline = this._pipeline;
-    if (this.currentEpoch) {
-      const waitForOneEpoch = this.onNewEpoch.waitForCount(1);
-      await this._processEpochInSeparateTask(this.currentEpoch);
-      await waitForOneEpoch;
-    }
-    let messageCounter = 0;
-    invariant8(pipeline, "Pipeline is not initialized.", {
-      F: __dxlog_file9,
-      L: 216,
-      S: this,
-      A: [
-        "pipeline",
-        "'Pipeline is not initialized.'"
-      ]
-    });
-    for await (const msg of pipeline.consume()) {
-      const span = this._usage.beginRecording();
-      this._mutations.inc();
-      const { feedKey, seq, data } = msg;
-      log8("processing message", {
-        feedKey,
-        seq
-      }, {
-        F: __dxlog_file9,
-        L: 222,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      try {
-        if (data.payload.data) {
-          const feedInfo = this._params.feedInfoProvider(feedKey);
-          if (!feedInfo) {
-            log8.warn("Could not find feed", {
-              feedKey
-            }, {
-              F: __dxlog_file9,
-              L: 228,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            continue;
-          }
-          const timer = tracer.mark("dxos.echo.pipeline.data");
-          this.databaseHost.echoProcessor({
-            batch: data.payload.data.batch,
-            meta: {
-              feedKey,
-              seq,
-              timeframe: data.timeframe,
-              memberKey: feedInfo.assertion.identityKey
-            }
-          });
-          timer.end();
-          log8.trace("dxos.echo.data-pipeline.processed", {
-            feedKey: feedKey.toHex(),
-            seq,
-            spaceKey: this._params.spaceKey.toHex()
-          }, {
-            F: __dxlog_file9,
-            L: 245,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          await this._noteTargetStateIfNeeded(pipeline.state.pendingTimeframe);
-        }
-      } catch (err) {
-        log8.catch(err, void 0, {
-          F: __dxlog_file9,
-          L: 255,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      span.end();
-      if (++messageCounter > 100) {
-        messageCounter = 0;
-        await idle(1e3);
-      }
-    }
-  }
-  _createSnapshot() {
-    invariant8(this.databaseHost, "Database backend is not initialized.", {
-      F: __dxlog_file9,
-      L: 269,
-      S: this,
-      A: [
-        "this.databaseHost",
-        "'Database backend is not initialized.'"
-      ]
-    });
-    return {
-      spaceKey: this._params.spaceKey.asUint8Array(),
-      timeframe: this._pipeline.state.timeframe,
-      database: this.databaseHost.createSnapshot()
-    };
-  }
-  async _saveTargetTimeframe(timeframe) {
-    const newTimeframe = Timeframe3.merge(this._targetTimeframe ?? new Timeframe3(), timeframe);
-    await this._params.metadataStore.setSpaceDataLatestTimeframe(this._params.spaceKey, newTimeframe);
-    this._targetTimeframe = newTimeframe;
-  }
-  async _noteTargetStateIfNeeded(timeframe) {
-    if (!this._pipeline?.state.reachedTarget) {
-      return;
-    }
-    if (Date.now() - this._lastTimeframeSaveTime > TIMEFRAME_SAVE_DEBOUNCE_INTERVAL) {
-      this._lastTimeframeSaveTime = Date.now();
-      await this._saveTargetTimeframe(timeframe);
-    }
-  }
-  async _processEpochInSeparateTask(epoch) {
-    if (epoch.subject.assertion.number <= this._lastProcessedEpoch) {
-      return;
-    }
-    await this._epochCtx?.dispose();
-    const ctx = new Context5({
-      onError: (err) => {
-        if (err instanceof CancelledError) {
-          log8("Epoch processing cancelled.", void 0, {
-            F: __dxlog_file9,
-            L: 305,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        } else {
-          log8.catch(err, void 0, {
-            F: __dxlog_file9,
-            L: 307,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        }
-      }
-    });
-    this._epochCtx = ctx;
-    scheduleTask2(ctx, async () => {
-      if (!this._isOpen) {
-        return;
-      }
-      await this._processEpoch(ctx, epoch.subject.assertion);
-      if (epoch.subject.assertion.snapshotCid === void 0) {
-        epoch.subject.assertion.snapshotCid = this.appliedEpoch?.subject.assertion.snapshotCid;
-      }
-      this.appliedEpoch = epoch;
-      this.onNewEpoch.emit(epoch);
-    });
-  }
-  async _processEpoch(ctx, epoch) {
-    invariant8(this._isOpen, "Space is closed.", {
-      F: __dxlog_file9,
-      L: 331,
-      S: this,
-      A: [
-        "this._isOpen",
-        "'Space is closed.'"
-      ]
-    });
-    invariant8(this._pipeline, void 0, {
-      F: __dxlog_file9,
-      L: 332,
-      S: this,
-      A: [
-        "this._pipeline",
-        ""
-      ]
-    });
-    this._lastProcessedEpoch = epoch.number;
-    log8("processing", {
-      epoch: omit(epoch, "proof")
-    }, {
-      F: __dxlog_file9,
-      L: 335,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    if (epoch.snapshotCid) {
-      const snapshot = await this._params.snapshotManager.load(ctx, epoch.snapshotCid);
-      this.databaseHost._itemDemuxer.restoreFromSnapshot(snapshot.database);
-    }
-    log8("restarting pipeline from epoch", void 0, {
-      F: __dxlog_file9,
-      L: 341,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._pipeline.pause();
-    await this._pipeline.setCursor(epoch.timeframe);
-    await this._pipeline.unpause();
-  }
-  async waitUntilTimeframe(timeframe) {
-    invariant8(this._pipeline, "Pipeline is not initialized.", {
-      F: __dxlog_file9,
-      L: 348,
-      S: this,
-      A: [
-        "this._pipeline",
-        "'Pipeline is not initialized.'"
-      ]
-    });
-    await this._pipeline.state.waitUntilTimeframe(timeframe);
-  }
-  async createEpoch() {
-    invariant8(this._pipeline, void 0, {
-      F: __dxlog_file9,
-      L: 354,
-      S: this,
-      A: [
-        "this._pipeline",
-        ""
-      ]
-    });
-    invariant8(this.currentEpoch, void 0, {
-      F: __dxlog_file9,
-      L: 355,
-      S: this,
-      A: [
-        "this.currentEpoch",
-        ""
-      ]
-    });
-    await this._pipeline.pause();
-    const snapshot = await this._createSnapshot();
-    const snapshotCid = await this._params.snapshotManager.store(snapshot);
-    const epoch = {
-      previousId: this.currentEpoch.id,
-      timeframe: this._pipeline.state.timeframe,
-      number: this.currentEpoch.subject.assertion.number + 1,
-      snapshotCid
-    };
-    await this._pipeline.unpause();
-    return epoch;
-  }
-  async ensureEpochInitialized() {
-    await this.onNewEpoch.waitForCondition(() => !!this.currentEpoch);
-  }
-  async _flush() {
-    try {
-      if (this._pipeline) {
-        await this._saveTargetTimeframe(this._pipeline.state.timeframe);
-      }
-    } catch (err) {
-      log8.catch(err, void 0, {
-        F: __dxlog_file9,
-        L: 384,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-    await this._params.metadataStore.flush();
-  }
-};
-_ts_decorate4([
-  trace.metricsCounter()
-], DataPipeline.prototype, "_usage", void 0);
-_ts_decorate4([
-  trace.metricsCounter()
-], DataPipeline.prototype, "_mutations", void 0);
-_ts_decorate4([
-  synchronized3
-], DataPipeline.prototype, "open", null);
-_ts_decorate4([
-  synchronized3
-], DataPipeline.prototype, "close", null);
-_ts_decorate4([
-  synchronized3
-], DataPipeline.prototype, "_processEpoch", null);
-_ts_decorate4([
-  synchronized3
-], DataPipeline.prototype, "createEpoch", null);
-DataPipeline = _ts_decorate4([
-  trackLeaks("open", "close"),
-  trace.resource()
-], DataPipeline);
-var idle = async (timeout) => {
-  if (!("scheduler" in globalThis && typeof globalThis.scheduler.postTask === "function")) {
-    await sleep(1);
-    return;
-  }
-  await new Promise((resolve) => {
-    const cleanup = () => {
-      clearTimeout(timer);
-      controller.abort();
-    };
-    const controller = new AbortController();
-    void globalThis.scheduler.postTask(() => {
-      cleanup();
-      resolve();
-    }, {
-      priority: "background",
-      signal: controller.signal
-    }).catch(() => {
-    });
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve();
-    }, timeout);
-  });
-};
-
-// packages/core/echo/echo-pipeline/src/space/space.ts
-import { Event as Event5, synchronized as synchronized4, trackLeaks as trackLeaks3, Mutex } from "@dxos/async";
-import { invariant as invariant9 } from "@dxos/invariant";
-import { log as log10, logInfo } from "@dxos/log";
-import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { trace as trace3 } from "@dxos/tracing";
-import { Callback as Callback2 } from "@dxos/util";
-
-// packages/core/echo/echo-pipeline/src/space/control-pipeline.ts
-import { DeferredTask, sleepWithContext as sleepWithContext2, trackLeaks as trackLeaks2 } from "@dxos/async";
-import { Context as Context6 } from "@dxos/context";
-import { SpaceStateMachine } from "@dxos/credentials";
-import { PublicKey as PublicKey5 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
-import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { Timeframe as Timeframe4 } from "@dxos/timeframe";
-import { TimeSeriesCounter as TimeSeriesCounter2, TimeUsageCounter as TimeUsageCounter2, trace as trace2 } from "@dxos/tracing";
-import { Callback, tracer as tracer2 } from "@dxos/util";
-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_file10 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/control-pipeline.ts";
-var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL2 = 500;
-var CONTROL_PIPELINE_SNAPSHOT_DELAY = 1e4;
-var USE_SNAPSHOTS = true;
-var ControlPipeline = class {
-  constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
-    this._ctx = new Context6();
-    this._lastTimeframeSaveTime = Date.now();
-    this.onFeedAdmitted = new Callback();
-    this._usage = new TimeUsageCounter2();
-    this._mutations = new TimeSeriesCounter2();
     this._snapshotTask = new DeferredTask(this._ctx, async () => {
       await sleepWithContext2(this._ctx, CONTROL_PIPELINE_SNAPSHOT_DELAY);
       await this._saveSnapshot();
@@ -1975,10 +1189,10 @@ var ControlPipeline = class {
     void this._pipeline.addFeed(genesisFeed);
     this._spaceStateMachine = new SpaceStateMachine(spaceKey);
     this._spaceStateMachine.onFeedAdmitted.set(async (info) => {
-      log9("feed admitted", {
+      log6("feed admitted", {
         key: info.key
       }, {
-        F: __dxlog_file10,
+        F: __dxlog_file7,
         L: 74,
         S: this,
         C: (f, a) => f(...a)
@@ -1991,8 +1205,8 @@ var ControlPipeline = class {
               await this._pipeline.addFeed(feed);
             }
           } catch (err) {
-            log9.catch(err, void 0, {
-              F: __dxlog_file10,
+            log6.catch(err, void 0, {
+              F: __dxlog_file7,
               L: 85,
               S: this,
               C: (f, a) => f(...a)
@@ -2017,12 +1231,12 @@ var ControlPipeline = class {
   }
   async start() {
     const snapshot = this._metadata.getSpaceControlPipelineSnapshot(this._spaceKey);
-    log9("load snapshot", {
+    log6("load snapshot", {
       key: this._spaceKey,
       present: !!snapshot,
       tf: snapshot?.timeframe
     }, {
-      F: __dxlog_file10,
+      F: __dxlog_file7,
       L: 113,
       S: this,
       C: (f, a) => f(...a)
@@ -2030,18 +1244,18 @@ var ControlPipeline = class {
     if (USE_SNAPSHOTS && snapshot) {
       await this._processSnapshot(snapshot);
     }
-    log9("starting...", void 0, {
-      F: __dxlog_file10,
+    log6("starting...", void 0, {
+      F: __dxlog_file7,
       L: 118,
       S: this,
       C: (f, a) => f(...a)
     });
     setTimeout(async () => {
-      void this._consumePipeline(new Context6());
+      void this._consumePipeline(new Context4());
     });
     await this._pipeline.start();
-    log9("started", void 0, {
-      F: __dxlog_file10,
+    log6("started", void 0, {
+      F: __dxlog_file7,
       L: 124,
       S: this,
       C: (f, a) => f(...a)
@@ -2055,10 +1269,10 @@ var ControlPipeline = class {
         skipVerification: true
       });
       if (!result) {
-        log9.warn("credential processing failed from snapshot", {
+        log6.warn("credential processing failed from snapshot", {
           message
         }, {
-          F: __dxlog_file10,
+          F: __dxlog_file7,
           L: 137,
           S: this,
           C: (f, a) => f(...a)
@@ -2076,11 +1290,11 @@ var ControlPipeline = class {
       }))
     };
     await this._pipeline.unpause();
-    log9("save snapshot", {
+    log6("save snapshot", {
       key: this._spaceKey,
       snapshot
     }, {
-      F: __dxlog_file10,
+      F: __dxlog_file7,
       L: 153,
       S: this,
       C: (f, a) => f(...a)
@@ -2094,8 +1308,8 @@ var ControlPipeline = class {
       try {
         await this._processMessage(ctx, msg);
       } catch (err) {
-        log9.catch(err, void 0, {
-          F: __dxlog_file10,
+        log6.catch(err, void 0, {
+          F: __dxlog_file7,
           L: 166,
           S: this,
           C: (f, a) => f(...a)
@@ -2105,26 +1319,26 @@ var ControlPipeline = class {
     }
   }
   async _processMessage(ctx, msg) {
-    log9("processing", {
+    log6("processing", {
       key: msg.feedKey,
       seq: msg.seq
     }, {
-      F: __dxlog_file10,
+      F: __dxlog_file7,
       L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
     if (msg.data.payload.credential) {
-      const timer = tracer2.mark("dxos.echo.pipeline.control");
+      const timer = tracer.mark("dxos.echo.pipeline.control");
       const result = await this._spaceStateMachine.process(msg.data.payload.credential.credential, {
-        sourceFeed: PublicKey5.from(msg.feedKey)
+        sourceFeed: PublicKey4.from(msg.feedKey)
       });
       timer.end();
       if (!result) {
-        log9.warn("processing failed", {
+        log6.warn("processing failed", {
           msg
         }, {
-          F: __dxlog_file10,
+          F: __dxlog_file7,
           L: 185,
           S: this,
           C: (f, a) => f(...a)
@@ -2136,14 +1350,14 @@ var ControlPipeline = class {
     }
   }
   async _noteTargetStateIfNeeded(timeframe) {
-    if (Date.now() - this._lastTimeframeSaveTime > TIMEFRAME_SAVE_DEBOUNCE_INTERVAL2) {
+    if (Date.now() - this._lastTimeframeSaveTime > TIMEFRAME_SAVE_DEBOUNCE_INTERVAL) {
       this._lastTimeframeSaveTime = Date.now();
       await this._saveTargetTimeframe(timeframe);
     }
   }
   async stop() {
-    log9("stopping...", void 0, {
-      F: __dxlog_file10,
+    log6("stopping...", void 0, {
+      F: __dxlog_file7,
       L: 205,
       S: this,
       C: (f, a) => f(...a)
@@ -2151,8 +1365,8 @@ var ControlPipeline = class {
     await this._ctx.dispose();
     await this._pipeline.stop();
     await this._saveTargetTimeframe(this._pipeline.state.timeframe);
-    log9("stopped", void 0, {
-      F: __dxlog_file10,
+    log6("stopped", void 0, {
+      F: __dxlog_file7,
       L: 209,
       S: this,
       C: (f, a) => f(...a)
@@ -2160,12 +1374,12 @@ var ControlPipeline = class {
   }
   async _saveTargetTimeframe(timeframe) {
     try {
-      const newTimeframe = Timeframe4.merge(this._targetTimeframe ?? new Timeframe4(), timeframe);
+      const newTimeframe = Timeframe3.merge(this._targetTimeframe ?? new Timeframe3(), timeframe);
       await this._metadata.setSpaceControlLatestTimeframe(this._spaceKey, newTimeframe);
       this._targetTimeframe = newTimeframe;
     } catch (err) {
-      log9(err, void 0, {
-        F: __dxlog_file10,
+      log6(err, void 0, {
+        F: __dxlog_file7,
         L: 218,
         S: this,
         C: (f, a) => f(...a)
@@ -2173,30 +1387,30 @@ var ControlPipeline = class {
     }
   }
 };
-_ts_decorate5([
-  trace2.metricsCounter()
+_ts_decorate4([
+  trace.metricsCounter()
 ], ControlPipeline.prototype, "_usage", void 0);
-_ts_decorate5([
-  trace2.metricsCounter()
+_ts_decorate4([
+  trace.metricsCounter()
 ], ControlPipeline.prototype, "_mutations", void 0);
-_ts_decorate5([
-  trace2.span({
+_ts_decorate4([
+  trace.span({
     showInBrowserTimeline: true
   })
 ], ControlPipeline.prototype, "start", null);
-_ts_decorate5([
-  trace2.span()
+_ts_decorate4([
+  trace.span()
 ], ControlPipeline.prototype, "_consumePipeline", null);
-_ts_decorate5([
-  trace2.span()
+_ts_decorate4([
+  trace.span()
 ], ControlPipeline.prototype, "_processMessage", null);
-ControlPipeline = _ts_decorate5([
-  trace2.resource(),
-  trackLeaks2("start", "stop")
+ControlPipeline = _ts_decorate4([
+  trace.resource(),
+  trackLeaks("start", "stop")
 ], ControlPipeline);
 
 // packages/core/echo/echo-pipeline/src/space/space.ts
-function _ts_decorate6(decorators, target, key, desc) {
+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);
@@ -2206,16 +1420,16 @@ function _ts_decorate6(decorators, target, key, desc) {
         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 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space.ts";
 var Space = class {
   constructor(params) {
     this._addFeedMutex = new Mutex();
     this.onCredentialProcessed = new Callback2();
-    this.stateUpdate = new Event5();
+    this.stateUpdate = new Event4();
     this._isOpen = false;
-    invariant9(params.spaceKey && params.feedProvider, void 0, {
-      F: __dxlog_file11,
-      L: 78,
+    invariant6(params.spaceKey && params.feedProvider, void 0, {
+      F: __dxlog_file8,
+      L: 72,
       S: this,
       A: [
         "params.spaceKey && params.feedProvider",
@@ -2234,17 +1448,6 @@ var Space = class {
     });
     this._controlPipeline.onFeedAdmitted.set(async (info) => {
       const sparse = info.assertion.designation === AdmittedFeed2.Designation.DATA;
-      if (info.assertion.designation === AdmittedFeed2.Designation.DATA) {
-        queueMicrotask(async () => {
-          if (this._dataPipeline.pipeline) {
-            if (!this._dataPipeline.pipeline.hasFeed(info.key)) {
-              return this._dataPipeline.pipeline.addFeed(await this._feedProvider(info.key, {
-                sparse
-              }));
-            }
-          }
-        });
-      }
       if (!info.key.equals(params.genesisFeed.key)) {
         queueMicrotask(async () => {
           this.protocol.addFeed(await params.feedProvider(info.key, {
@@ -2255,11 +1458,11 @@ var Space = class {
     });
     this._controlPipeline.onCredentialProcessed.set(async (credential) => {
       await this.onCredentialProcessed.callIfSet(credential);
-      log10("onCredentialProcessed", {
+      log7("onCredentialProcessed", {
         credential
       }, {
-        F: __dxlog_file11,
-        L: 116,
+        F: __dxlog_file8,
+        L: 99,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2267,29 +1470,6 @@ var Space = class {
     });
     this.protocol = params.protocol;
     this.protocol.addFeed(params.genesisFeed);
-    this._dataPipeline = new DataPipeline({
-      modelFactory: params.modelFactory,
-      metadataStore: params.metadataStore,
-      snapshotManager: params.snapshotManager,
-      memberKey: params.memberKey,
-      spaceKey: this._key,
-      feedInfoProvider: (feedKey) => this._controlPipeline.spaceState.feeds.get(feedKey),
-      snapshotId: params.snapshotId,
-      onPipelineCreated: async (pipeline) => {
-        if (this._dataFeed) {
-          pipeline.setWriteFeed(this._dataFeed);
-        }
-        await this._addFeedMutex.executeSynchronized(async () => {
-          for (const feed of this._controlPipeline.spaceState.feeds.values()) {
-            if (feed.assertion.designation === AdmittedFeed2.Designation.DATA && !pipeline.hasFeed(feed.key)) {
-              await pipeline.addFeed(await this._feedProvider(feed.key, {
-                sparse: true
-              }));
-            }
-          }
-        });
-      }
-    });
   }
   get key() {
     return this._key;
@@ -2315,16 +1495,13 @@ var Space = class {
   get controlPipeline() {
     return this._controlPipeline.pipeline;
   }
-  get dataPipeline() {
-    return this._dataPipeline;
-  }
   get snapshotManager() {
     return this._snapshotManager;
   }
   async setControlFeed(feed) {
-    invariant9(!this._controlFeed, "Control feed already set.", {
-      F: __dxlog_file11,
-      L: 191,
+    invariant6(!this._controlFeed, "Control feed already set.", {
+      F: __dxlog_file8,
+      L: 146,
       S: this,
       A: [
         "!this._controlFeed",
@@ -2336,9 +1513,9 @@ var Space = class {
     return this;
   }
   async setDataFeed(feed) {
-    invariant9(!this._dataFeed, "Data feed already set.", {
-      F: __dxlog_file11,
-      L: 198,
+    invariant6(!this._dataFeed, "Data feed already set.", {
+      F: __dxlog_file8,
+      L: 153,
       S: this,
       A: [
         "!this._dataFeed",
@@ -2346,8 +1523,6 @@ var Space = class {
       ]
     });
     this._dataFeed = feed;
-    await this._dataPipeline.pipeline?.addFeed(feed);
-    this._dataPipeline.pipeline?.setWriteFeed(feed);
     return this;
   }
   /**
@@ -2363,9 +1538,9 @@ var Space = class {
   //   return this._dataPipeline?.getFeeds();
   // }
   async open(ctx) {
-    log10("opening...", void 0, {
-      F: __dxlog_file11,
-      L: 221,
+    log7("opening...", void 0, {
+      F: __dxlog_file8,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2374,97 +1549,70 @@ var Space = class {
     }
     await this._controlPipeline.start();
     await this.protocol.start();
-    await this._controlPipeline.spaceState.addCredentialProcessor(this._dataPipeline);
     this._isOpen = true;
-    log10("opened", void 0, {
-      F: __dxlog_file11,
-      L: 232,
+    log7("opened", void 0, {
+      F: __dxlog_file8,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    log10("closing...", {
+    log7("closing...", {
       key: this._key
     }, {
-      F: __dxlog_file11,
-      L: 237,
+      F: __dxlog_file8,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
     if (!this._isOpen) {
       return;
     }
-    await this._controlPipeline.spaceState.removeCredentialProcessor(this._dataPipeline);
-    await this._dataPipeline.close();
     await this.protocol.stop();
     await this._controlPipeline.stop();
     this._isOpen = false;
-    log10("closed", void 0, {
-      F: __dxlog_file11,
-      L: 250,
+    log7("closed", void 0, {
+      F: __dxlog_file8,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async initializeDataPipeline() {
-    log10("initializeDataPipeline", void 0, {
-      F: __dxlog_file11,
-      L: 255,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant9(this._isOpen, "Space must be open to initialize data pipeline.", {
-      F: __dxlog_file11,
-      L: 256,
-      S: this,
-      A: [
-        "this._isOpen",
-        "'Space must be open to initialize data pipeline.'"
-      ]
-    });
-    await this._dataPipeline.open();
-  }
 };
-_ts_decorate6([
-  trace3.info()
+_ts_decorate5([
+  trace2.info()
 ], Space.prototype, "protocol", void 0);
-_ts_decorate6([
-  trace3.info()
+_ts_decorate5([
+  trace2.info()
 ], Space.prototype, "_controlPipeline", void 0);
-_ts_decorate6([
-  trace3.info()
-], Space.prototype, "_dataPipeline", void 0);
-_ts_decorate6([
+_ts_decorate5([
   logInfo,
-  trace3.info()
+  trace2.info()
 ], Space.prototype, "key", null);
-_ts_decorate6([
-  synchronized4,
-  trace3.span()
+_ts_decorate5([
+  synchronized3,
+  trace2.span()
 ], Space.prototype, "open", null);
-_ts_decorate6([
-  synchronized4
+_ts_decorate5([
+  synchronized3
 ], Space.prototype, "close", null);
-_ts_decorate6([
-  synchronized4
-], Space.prototype, "initializeDataPipeline", null);
-Space = _ts_decorate6([
-  trackLeaks3("open", "close"),
-  trace3.resource()
+Space = _ts_decorate5([
+  trackLeaks2("open", "close"),
+  trace2.resource()
 ], Space);
 
 // packages/core/echo/echo-pipeline/src/space/space-protocol.ts
 import { discoveryKey, subtleCrypto as subtleCrypto2 } from "@dxos/crypto";
-import { PublicKey as PublicKey6 } from "@dxos/keys";
-import { log as log11, logInfo as logInfo2 } from "@dxos/log";
+import { PublicKey as PublicKey5 } from "@dxos/keys";
+import { log as log8, logInfo as logInfo2 } from "@dxos/log";
 import { MMSTTopology } from "@dxos/network-manager";
 import { Teleport } from "@dxos/teleport";
 import { BlobSync } from "@dxos/teleport-extension-object-sync";
 import { ReplicatorExtension } from "@dxos/teleport-extension-replicator";
-import { trace as trace4 } from "@dxos/tracing";
-import { ComplexMap as ComplexMap5 } from "@dxos/util";
-function _ts_decorate7(decorators, target, key, desc) {
+import { trace as trace3 } from "@dxos/tracing";
+import { ComplexMap as ComplexMap3 } from "@dxos/util";
+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);
@@ -2474,13 +1622,13 @@ function _ts_decorate7(decorators, target, key, desc) {
         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_file12 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-protocol.ts";
+var __dxlog_file9 = "/home/runner/work/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 {
   constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore }) {
     this._feeds = /* @__PURE__ */ new Set();
-    this._sessions = new ComplexMap5(PublicKey6.hash);
+    this._sessions = new ComplexMap3(PublicKey5.hash);
     this._spaceKey = topic;
     this._networkManager = networkManager;
     this._swarmIdentity = swarmIdentity;
@@ -2489,7 +1637,7 @@ var SpaceProtocol = class {
     this.blobSync = new BlobSync({
       blobStore
     });
-    this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey6.from);
+    this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
   }
   get sessions() {
     return this._sessions;
@@ -2502,10 +1650,10 @@ var SpaceProtocol = class {
   }
   // TODO(burdon): Create abstraction for Space (e.g., add keys and have provider).
   addFeed(feed) {
-    log11("addFeed", {
+    log8("addFeed", {
       key: feed.key
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file9,
       L: 103,
       S: this,
       C: (f, a) => f(...a)
@@ -2527,8 +1675,8 @@ var SpaceProtocol = class {
       sampleSize: 20
     };
     await this.blobSync.open();
-    log11("starting...", void 0, {
-      F: __dxlog_file12,
+    log8("starting...", void 0, {
+      F: __dxlog_file9,
       L: 129,
       S: this,
       C: (f, a) => f(...a)
@@ -2541,8 +1689,8 @@ var SpaceProtocol = class {
       topology: new MMSTTopology(topologyConfig),
       label: `swarm ${topic.truncate()} for space ${this._spaceKey.truncate()}`
     });
-    log11("started", void 0, {
-      F: __dxlog_file12,
+    log8("started", void 0, {
+      F: __dxlog_file9,
       L: 139,
       S: this,
       C: (f, a) => f(...a)
@@ -2551,15 +1699,15 @@ var SpaceProtocol = class {
   async stop() {
     await this.blobSync.close();
     if (this._connection) {
-      log11("stopping...", void 0, {
-        F: __dxlog_file12,
+      log8("stopping...", void 0, {
+        F: __dxlog_file9,
         L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._connection.close();
-      log11("stopped", void 0, {
-        F: __dxlog_file12,
+      log8("stopped", void 0, {
+        F: __dxlog_file9,
         L: 148,
         S: this,
         C: (f, a) => f(...a)
@@ -2583,18 +1731,18 @@ var SpaceProtocol = class {
     };
   }
 };
-_ts_decorate7([
+_ts_decorate6([
   logInfo2,
-  trace4.info()
+  trace3.info()
 ], SpaceProtocol.prototype, "_topic", void 0);
-_ts_decorate7([
-  trace4.info()
+_ts_decorate6([
+  trace3.info()
 ], SpaceProtocol.prototype, "_spaceKey", void 0);
-_ts_decorate7([
+_ts_decorate6([
   logInfo2
 ], SpaceProtocol.prototype, "_ownPeerKey", null);
-SpaceProtocol = _ts_decorate7([
-  trace4.resource()
+SpaceProtocol = _ts_decorate6([
+  trace3.resource()
 ], SpaceProtocol);
 var AuthStatus;
 (function(AuthStatus2) {
@@ -2632,8 +1780,8 @@ var SpaceProtocolSession = class {
       provider: this._swarmIdentity.credentialProvider,
       verifier: this._swarmIdentity.credentialAuthenticator,
       onAuthSuccess: () => {
-        log11("Peer authenticated", void 0, {
-          F: __dxlog_file12,
+        log8("Peer authenticated", void 0, {
+          F: __dxlog_file9,
           L: 245,
           S: this,
           C: (f, a) => f(...a)
@@ -2650,8 +1798,8 @@ var SpaceProtocolSession = class {
     this._teleport.addExtension("dxos.mesh.teleport.blobsync", this._blobSync.createExtension());
   }
   async close() {
-    log11("close", void 0, {
-      F: __dxlog_file12,
+    log8("close", void 0, {
+      F: __dxlog_file9,
       L: 261,
       S: this,
       C: (f, a) => f(...a)
@@ -2662,21 +1810,21 @@ var SpaceProtocolSession = class {
     await this._teleport.abort();
   }
 };
-_ts_decorate7([
+_ts_decorate6([
   logInfo2
 ], SpaceProtocolSession.prototype, "_wireParams", void 0);
-_ts_decorate7([
+_ts_decorate6([
   logInfo2
 ], SpaceProtocolSession.prototype, "authStatus", null);
 
 // packages/core/echo/echo-pipeline/src/space/space-manager.ts
-import { synchronized as synchronized5, trackLeaks as trackLeaks4 } from "@dxos/async";
+import { synchronized as synchronized4, trackLeaks as trackLeaks3 } from "@dxos/async";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log12 } from "@dxos/log";
-import { trace as trace5 } from "@dxos/protocols";
-import { ComplexMap as ComplexMap6 } from "@dxos/util";
-function _ts_decorate8(decorators, target, key, desc) {
+import { PublicKey as PublicKey6 } from "@dxos/keys";
+import { log as log9 } from "@dxos/log";
+import { trace as trace4 } from "@dxos/protocols";
+import { ComplexMap as ComplexMap4 } from "@dxos/util";
+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);
@@ -2686,14 +1834,13 @@ function _ts_decorate8(decorators, target, key, desc) {
         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_file13 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-manager.ts";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-manager.ts";
 var SpaceManager = class {
-  constructor({ feedStore, networkManager, modelFactory, metadataStore, snapshotStore, blobStore }) {
-    this._spaces = new ComplexMap6(PublicKey7.hash);
-    this._instanceId = PublicKey7.random().toHex();
+  constructor({ feedStore, networkManager, metadataStore, snapshotStore, blobStore }) {
+    this._spaces = new ComplexMap4(PublicKey6.hash);
+    this._instanceId = PublicKey6.random().toHex();
     this._feedStore = feedStore;
     this._networkManager = networkManager;
-    this._modelFactory = modelFactory;
     this._metadataStore = metadataStore;
     this._snapshotStore = snapshotStore;
     this._blobStore = blobStore;
@@ -2710,19 +1857,19 @@ var SpaceManager = class {
     ].map((space) => space.close()));
   }
   async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, memberKey }) {
-    log12.trace("dxos.echo.space-manager.construct-space", trace5.begin({
+    log9.trace("dxos.echo.space-manager.construct-space", trace4.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
-      L: 100,
+      F: __dxlog_file10,
+      L: 89,
       S: this,
       C: (f, a) => f(...a)
     });
-    log12("constructing space...", {
+    log9("constructing space...", {
       spaceKey: metadata.genesisFeedKey
     }, {
-      F: __dxlog_file13,
-      L: 101,
+      F: __dxlog_file10,
+      L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2742,42 +1889,38 @@ var SpaceManager = class {
       protocol,
       genesisFeed,
       feedProvider: (feedKey, opts) => this._feedStore.openFeed(feedKey, opts),
-      modelFactory: this._modelFactory,
       metadataStore: this._metadataStore,
       snapshotManager,
       memberKey
     });
     this._spaces.set(space.key, space);
-    log12.trace("dxos.echo.space-manager.construct-space", trace5.end({
+    log9.trace("dxos.echo.space-manager.construct-space", trace4.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
-      L: 129,
+      F: __dxlog_file10,
+      L: 117,
       S: this,
       C: (f, a) => f(...a)
     });
     return space;
   }
 };
-_ts_decorate8([
-  synchronized5
+_ts_decorate7([
+  synchronized4
 ], SpaceManager.prototype, "open", null);
-_ts_decorate8([
-  synchronized5
+_ts_decorate7([
+  synchronized4
 ], SpaceManager.prototype, "close", null);
-SpaceManager = _ts_decorate8([
-  trackLeaks4("open", "close")
+SpaceManager = _ts_decorate7([
+  trackLeaks3("open", "close")
 ], SpaceManager);
 
 export {
   codec,
   valueEncoding,
   createMappedFeedWriter,
-  DataServiceHost,
-  DatabaseHost,
   SnapshotManager,
   SnapshotStore,
-  DataServiceSubscriptions,
   DataServiceImpl,
   MetadataStore,
   mapTimeframeToFeedIndexes,
@@ -2786,7 +1929,6 @@ export {
   TimeframeClock,
   Pipeline,
   AuthExtension,
-  DataPipeline,
   Space,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,
@@ -2795,4 +1937,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-WAN2XUWE.mjs.map
+//# sourceMappingURL=chunk-RTEEJ723.mjs.map