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

package/dist/lib/browser/index.mjs

@@ -3,7 +3,7 @@ import {
   filterMatchObject,
   filterMatchObjectJSON,
   filterMatchValue
-} from "./chunk-MBMJB3V7.mjs";
+} from "./chunk-WJJXJTNS.mjs";
 import {
   AuthExtension,
   AuthStatus,
@@ -26,7 +26,7 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-I4JBIZSN.mjs";
+} from "./chunk-XGG76KKU.mjs";
 import "./chunk-CGS2ULMK.mjs";
 
 // src/db-host/data-service.ts
@@ -39,7 +39,6 @@ import { log as log7 } from "@dxos/log";
 // src/automerge/automerge-host.ts
 import { getBackend, getHeads, equals as headsEquals, isAutomerge, save } from "@automerge/automerge";
 import { Repo, interpretAsDocumentId } from "@automerge/automerge-repo";
-import { exportBundle } from "@automerge/automerge-repo-bundles";
 import { DeferredTask, Event as Event2, asyncTimeout } from "@dxos/async";
 import { Context, Resource as Resource3, cancelWithContext } from "@dxos/context";
 import { DatabaseDirectory } from "@dxos/echo-protocol";
@@ -48,10 +47,12 @@ import { PublicKey } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace as trace2 } from "@dxos/tracing";
-import { ComplexSet, bufferToArray, range } from "@dxos/util";
+import { ComplexSet, bufferToArray, isNonNullable as isNonNullable2, range } from "@dxos/util";
 
 // src/automerge/collection-synchronizer.ts
-import { next as am } from "@automerge/automerge";
+import { next as A } from "@automerge/automerge";
+import * as Array2 from "effect/Array";
+import * as Record from "effect/Record";
 import { Event, asyncReturn, scheduleTask, scheduleTaskInterval } from "@dxos/async";
 import { Resource } from "@dxos/context";
 import { log } from "@dxos/log";
@@ -105,7 +106,7 @@ var CollectionSynchronizer = class extends Resource {
       state
     }, {
       F: __dxlog_file,
-      L: 76,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -124,7 +125,7 @@ var CollectionSynchronizer = class extends Resource {
       collectionId
     }, {
       F: __dxlog_file,
-      L: 90,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -207,7 +208,7 @@ var CollectionSynchronizer = class extends Resource {
       state
     }, {
       F: __dxlog_file,
-      L: 171,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -272,19 +273,18 @@ CollectionSynchronizer = _ts_decorate([
   trace.resource()
 ], CollectionSynchronizer);
 var diffCollectionState = (local, remote) => {
-  const allDocuments = /* @__PURE__ */ new Set([
-    ...Object.keys(local.documents),
-    ...Object.keys(remote.documents)
-  ]);
+  const localDocuments = Record.filter(local.documents, (heads) => heads.length > 0);
+  const remoteDocuments = Record.filter(remote.documents, (heads) => heads.length > 0);
+  const allDocuments = Array2.union(Record.keys(localDocuments), Record.keys(remoteDocuments));
   const missingOnRemote = [];
   const missingOnLocal = [];
   const different = [];
   for (const documentId of allDocuments) {
-    if (!local.documents[documentId] || local.documents[documentId].length === 0) {
+    if (!localDocuments[documentId]) {
       missingOnLocal.push(documentId);
-    } else if (!remote.documents[documentId] || remote.documents[documentId].length === 0) {
+    } else if (!remoteDocuments[documentId]) {
       missingOnRemote.push(documentId);
-    } else if (!am.equals(local.documents[documentId], remote.documents[documentId])) {
+    } else if (!A.equals(local.documents[documentId], remote.documents[documentId])) {
       different.push(documentId);
     }
   }
@@ -299,7 +299,7 @@ var validateCollectionState = (state) => {
     if (!isValidDocumentId(documentId)) {
       throw new Error(`Invalid documentId: ${documentId}`);
     }
-    if (Array.isArray(heads) && heads.some((head) => typeof head !== "string")) {
+    if (Array2.isArray(heads) && heads.some((head) => typeof head !== "string")) {
       throw new Error(`Invalid heads: ${heads}`);
     }
   });
@@ -934,7 +934,7 @@ var AutomergeHost = class extends Resource3 {
             err
           }, {
             F: __dxlog_file3,
-            L: 224,
+            L: 223,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -968,7 +968,7 @@ var AutomergeHost = class extends Resource3 {
   async addReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 260,
+      L: 259,
       S: this,
       A: [
         "this.isOpen",
@@ -980,7 +980,7 @@ var AutomergeHost = class extends Resource3 {
   async removeReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 265,
+      L: 264,
       S: this,
       A: [
         "this.isOpen",
@@ -995,7 +995,7 @@ var AutomergeHost = class extends Resource3 {
   async loadDoc(ctx, documentId, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 273,
+      L: 272,
       S: this,
       A: [
         "this.isOpen",
@@ -1021,7 +1021,7 @@ var AutomergeHost = class extends Resource3 {
   async exportDoc(ctx, id) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 296,
+      L: 295,
       S: this,
       A: [
         "this.isOpen",
@@ -1040,7 +1040,7 @@ var AutomergeHost = class extends Resource3 {
   createDoc(initialValue, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 307,
+      L: 306,
       S: this,
       A: [
         "this.isOpen",
@@ -1065,7 +1065,7 @@ var AutomergeHost = class extends Resource3 {
   async waitUntilHeadsReplicated(heads) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 329,
+      L: 328,
       S: this,
       A: [
         "this.isOpen",
@@ -1087,10 +1087,10 @@ var AutomergeHost = class extends Resource3 {
       return !(currentHeads !== null && headsEquals(currentHeads, targetHeads));
     });
     if (headsToWait.length > 0) {
-      await Promise.all(headsToWait.map(async (entry, index) => {
+      await Promise.all(headsToWait.map(async (entry) => {
         const handle = await this.loadDoc(Context.default(void 0, {
           F: __dxlog_file3,
-          L: 347
+          L: 346
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -1100,7 +1100,7 @@ var AutomergeHost = class extends Resource3 {
   async reIndexHeads(documentIds) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 360,
+      L: 359,
       S: this,
       A: [
         "this.isOpen",
@@ -1112,7 +1112,7 @@ var AutomergeHost = class extends Resource3 {
         documentId
       }, {
         F: __dxlog_file3,
-        L: 362,
+        L: 361,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1122,7 +1122,7 @@ var AutomergeHost = class extends Resource3 {
           documentId
         }, {
           F: __dxlog_file3,
-          L: 365,
+          L: 364,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1135,7 +1135,7 @@ var AutomergeHost = class extends Resource3 {
     }
     log3("done re-indexing heads", void 0, {
       F: __dxlog_file3,
-      L: 374,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1145,9 +1145,6 @@ var AutomergeHost = class extends Resource3 {
   // NOTE: If both peers return sharePolicy=false the replication will not happen
   // https://github.com/automerge/automerge-repo/pull/292
   async _sharePolicy(peerId, documentId) {
-    if (peerId.startsWith("client-")) {
-      return false;
-    }
     if (!documentId) {
       return false;
     }
@@ -1213,7 +1210,7 @@ var AutomergeHost = class extends Resource3 {
     this._headsUpdates.set(documentId, heads);
     invariant2(this._onHeadsChangedTask, "onHeadsChangedTask is not initialized", {
       F: __dxlog_file3,
-      L: 450,
+      L: 445,
       S: this,
       A: [
         "this._onHeadsChangedTask",
@@ -1257,11 +1254,12 @@ var AutomergeHost = class extends Resource3 {
   * Flush documents to disk.
   */
   async flush({ documentIds } = {}) {
-    const loadedDocuments = documentIds?.filter((documentId) => {
+    const loadedDocuments = (documentIds ?? Object.keys(this._repo.handles)).filter((documentId) => {
       const handle = this._repo.handles[documentId];
       return handle && handle.isReady();
     });
     await this._repo.flush(loadedDocuments);
+    await this._onHeadsChangedTask?.runBlocking();
   }
   async getHeads(documentIds) {
     const result = [];
@@ -1396,7 +1394,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnRemote.length
       }, {
         F: __dxlog_file3,
-        L: 649,
+        L: 650,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1409,7 +1407,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnRemote.length
       }, {
         F: __dxlog_file3,
-        L: 653,
+        L: 654,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1420,7 +1418,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnLocal.length
       }, {
         F: __dxlog_file3,
-        L: 661,
+        L: 662,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1433,7 +1431,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnLocal.length
       }, {
         F: __dxlog_file3,
-        L: 665,
+        L: 666,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1449,7 +1447,7 @@ var AutomergeHost = class extends Resource3 {
       count: toReplicateWithoutBatching.length
     }, {
       F: __dxlog_file3,
-      L: 677,
+      L: 678,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1477,7 +1475,7 @@ var AutomergeHost = class extends Resource3 {
             err
           }, {
             F: __dxlog_file3,
-            L: 708,
+            L: 709,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1493,13 +1491,38 @@ var AutomergeHost = class extends Resource3 {
     if (this._ctx.disposed) {
       return;
     }
-    const handles = documentIds.map((documentId) => this._repo.handles[documentId]);
-    const bundle = exportBundle(this._repo, handles);
-    await this._echoNetworkAdapter.pushBundle(peerId, Array.from(bundle.docs.entries()).map(([documentId, doc]) => ({
-      documentId,
-      data: doc.data,
-      heads: doc.heads
-    })));
+    const docs = documentIds.map((documentId) => {
+      const handle = this._repo.handles[documentId];
+      if (!handle || !handle.isReady()) {
+        log3.warn("document not ready, skipping", {
+          documentId
+        }, {
+          F: __dxlog_file3,
+          L: 727,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      const doc = handle.doc();
+      if (!doc) {
+        log3.warn("document not available, skipping", {
+          documentId
+        }, {
+          F: __dxlog_file3,
+          L: 732,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      return {
+        documentId,
+        data: save(doc),
+        heads: getHeads(doc)
+      };
+    });
+    await this._echoNetworkAdapter.pushBundle(peerId, docs.filter(isNonNullable2));
   }
   async _pullInBundles(peerId, documentIds) {
     const documentsToPull = [
@@ -1520,7 +1543,7 @@ var AutomergeHost = class extends Resource3 {
             err
           }, {
             F: __dxlog_file3,
-            L: 752,
+            L: 762,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1558,9 +1581,12 @@ var AutomergeHost = class extends Resource3 {
     const collectionsChanged = /* @__PURE__ */ new Set();
     for (const collectionId of this._collectionSynchronizer.getRegisteredCollectionIds()) {
       const state = this._collectionSynchronizer.getLocalCollectionState(collectionId);
+      if (!state) {
+        continue;
+      }
       let newState;
       for (const [documentId, heads] of docHeads) {
-        if (state?.documents[documentId]) {
+        if (documentId in state.documents) {
           if (!newState) {
             newState = structuredClone(state);
           }
@@ -1648,7 +1674,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   invariant2(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file3,
-    L: 832,
+    L: 845,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1668,7 +1694,7 @@ import { log as log5 } from "@dxos/log";
 import { ComplexSet as ComplexSet2, defaultMap as defaultMap2 } from "@dxos/util";
 
 // src/automerge/mesh-echo-replicator-connection.ts
-import * as A from "@automerge/automerge";
+import * as A2 from "@automerge/automerge";
 import { cbor } from "@automerge/automerge-repo";
 import { Resource as Resource4 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
@@ -1809,7 +1835,7 @@ var MeshReplicatorConnection = class extends Resource4 {
 };
 var logSendSync = (message) => {
   log4("sendSyncMessage", () => {
-    const decodedSyncMessage = message.type === "sync" && message.data ? A.decodeSyncMessage(message.data) : void 0;
+    const decodedSyncMessage = message.type === "sync" && message.data ? A2.decodeSyncMessage(message.data) : void 0;
     return {
       sync: decodedSyncMessage && {
         headsLength: decodedSyncMessage.heads.length,
@@ -2472,7 +2498,7 @@ var getByteCount = (message) => {
 };
 
 // src/db-host/documents-synchronizer.ts
-import { next as A2 } from "@automerge/automerge";
+import { next as A3 } from "@automerge/automerge";
 import { UpdateScheduler, sleep } from "@dxos/async";
 import { LifecycleState as LifecycleState2, Resource as Resource5, cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
@@ -2613,11 +2639,11 @@ var DocumentsSynchronizer = class extends Resource5 {
       return;
     }
     const doc = handle.doc();
-    const mutation = syncState.lastSentHead ? A2.saveSince(doc, syncState.lastSentHead) : A2.save(doc);
+    const mutation = syncState.lastSentHead ? A3.saveSince(doc, syncState.lastSentHead) : A3.save(doc);
     if (mutation.length === 0) {
       return;
     }
-    syncState.lastSentHead = A2.getHeads(doc);
+    syncState.lastSentHead = A3.getHeads(doc);
     return mutation;
   }
   _writeMutation(documentId, mutation, isNew) {
@@ -2629,7 +2655,7 @@ var DocumentsSynchronizer = class extends Resource5 {
         docId: documentId
       });
       const syncState = this._startSync(newHandle);
-      syncState.lastSentHead = A2.getHeads(newHandle.doc());
+      syncState.lastSentHead = A3.getHeads(newHandle.doc());
     } else {
       const syncState = this._syncStates.get(documentId);
       invariant6(syncState, "Sync state for document not found", {
@@ -2641,12 +2667,12 @@ var DocumentsSynchronizer = class extends Resource5 {
           "'Sync state for document not found'"
         ]
       });
-      const headsBefore = A2.getHeads(syncState.handle.doc());
+      const headsBefore = A3.getHeads(syncState.handle.doc());
       this._params.repo.import(mutation, {
         docId: documentId
       });
-      if (A2.equals(headsBefore, syncState.lastSentHead)) {
-        syncState.lastSentHead = A2.getHeads(syncState.handle.doc());
+      if (A3.equals(headsBefore, syncState.lastSentHead)) {
+        syncState.lastSentHead = A3.getHeads(syncState.handle.doc());
       }
     }
   }
@@ -2819,7 +2845,7 @@ import { IndexKind } from "@dxos/protocols/proto/dxos/echo/indexing";
 import { trace as trace5 } from "@dxos/tracing";
 
 // src/db-host/documents-iterator.ts
-import * as A3 from "@automerge/automerge";
+import * as A4 from "@automerge/automerge";
 import { Context as Context2 } from "@dxos/context";
 import { DatabaseDirectory as DatabaseDirectory2, SpaceDocVersion } from "@dxos/echo-protocol";
 import { invariant as invariant8 } from "@dxos/invariant";
@@ -2850,10 +2876,10 @@ var createSelectedDocumentsIterator = (automergeHost) => (
             ""
           ]
         });
-        const currentHeads = A3.getHeads(doc);
-        if (!A3.equals(currentHeads, heads)) {
+        const currentHeads = A4.getHeads(doc);
+        if (!A4.equals(currentHeads, heads)) {
           const begin = Date.now();
-          doc = A3.view(doc, heads);
+          doc = A4.view(doc, heads);
           const end = Date.now();
           if (end - begin > LOG_VIEW_OPERATION_THRESHOLD) {
             log8("Checking out document version is taking too long", {
@@ -2908,7 +2934,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
 
 // src/db-host/query-service.ts
 import { getHeads as getHeads3 } from "@automerge/automerge";
-import { Schema } from "effect";
+import * as Schema from "effect/Schema";
 import { DeferredTask as DeferredTask2, scheduleMicroTask, synchronized as synchronized2 } from "@dxos/async";
 import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
 import { Context as Context4, Resource as Resource7 } from "@dxos/context";
@@ -2919,7 +2945,8 @@ import { objectPointerCodec as objectPointerCodec4 } from "@dxos/protocols";
 import { trace as trace4 } from "@dxos/tracing";
 
 // src/query/query-executor.ts
-import { Match, Predicate } from "effect";
+import * as Match from "effect/Match";
+import * as Predicate from "effect/Predicate";
 import { Context as Context3, ContextDisposedError, LifecycleState as LifecycleState3, Resource as Resource6 } from "@dxos/context";
 import { DatabaseDirectory as DatabaseDirectory3, ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
 import { EscapedPropPath } from "@dxos/indexing";
@@ -2927,7 +2954,7 @@ import { invariant as invariant10 } from "@dxos/invariant";
 import { DXN, PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
 import { objectPointerCodec as objectPointerCodec3 } from "@dxos/protocols";
-import { getDeep, isNonNullable as isNonNullable2 } from "@dxos/util";
+import { getDeep, isNonNullable as isNonNullable3 } from "@dxos/util";
 
 // src/query/query-planner.ts
 import { Order } from "@dxos/echo";
@@ -2937,6 +2964,8 @@ import { invariant as invariant9 } from "@dxos/invariant";
 import { BaseError } from "@dxos/errors";
 var QueryError = class extends BaseError.extend("QUERY_ERROR") {
 };
+var InvalidQueryError = class extends QueryError.extend("INVALID_QUERY") {
+};
 
 // src/query/plan.ts
 (function(QueryPlan2) {
@@ -3011,7 +3040,8 @@ var QueryPlanner = class {
       case "order":
         return this._generateOrderClause(query, context);
       default:
-        throw new QueryError(`Unsupported query type: ${query.type}`, {
+        throw new QueryError({
+          message: `Unsupported query type: ${query.type}`,
           context: {
             query: context.originalQuery
           }
@@ -3035,10 +3065,11 @@ var QueryPlanner = class {
   }
   // TODO(dmaretskyi): This can be rewritten as a function of (filter[]) -> (selection ? undefined, rest: filter[]) that recurses onto itself.
   // TODO(dmaretskyi): If the tip of the query ast is a [select, ...filter] shape we can reorder the filters so the query is most efficient.
-  _generateSelectionFromFilter(filter, context) {
-    switch (filter.type) {
+  _generateSelectionFromFilter(filter2, context) {
+    switch (filter2.type) {
+      // Props
       case "object": {
-        if (context.selectionInverted && filter.id === void 0 && filter.typename === null && Object.keys(filter.props).length === 0) {
+        if (context.selectionInverted && filter2.id === void 0 && filter2.typename === null && Object.keys(filter2.props).length === 0) {
           return QueryPlan.Plan.make([
             {
               _tag: "ClearWorkingSetStep"
@@ -3047,32 +3078,33 @@ var QueryPlanner = class {
           ]);
         }
         if (context.selectionInverted) {
-          throw new QueryError("Query too complex", {
+          throw new QueryError({
+            message: "Query too complex",
             context: {
               query: context.originalQuery
             }
           });
         }
-        if (filter.id && filter.id?.length > 0) {
+        if (filter2.id && filter2.id?.length > 0) {
           return QueryPlan.Plan.make([
             {
               _tag: "SelectStep",
               spaces: context.selectionSpaces,
               selector: {
                 _tag: "IdSelector",
-                objectIds: filter.id
+                objectIds: filter2.id
               }
             },
             ...this._generateDeletedHandlingSteps(context),
             {
               _tag: "FilterStep",
               filter: {
-                ...filter,
+                ...filter2,
                 id: void 0
               }
             }
           ]);
-        } else if (filter.typename) {
+        } else if (filter2.typename) {
           return QueryPlan.Plan.make([
             {
               _tag: "SelectStep",
@@ -3080,7 +3112,7 @@ var QueryPlanner = class {
               selector: {
                 _tag: "TypeSelector",
                 typename: [
-                  filter.typename
+                  filter2.typename
                 ],
                 inverted: false
               }
@@ -3089,7 +3121,7 @@ var QueryPlanner = class {
             {
               _tag: "FilterStep",
               filter: {
-                ...filter,
+                ...filter2,
                 typename: null
               }
             }
@@ -3107,12 +3139,32 @@ var QueryPlanner = class {
             {
               _tag: "FilterStep",
               filter: {
-                ...filter
+                ...filter2
               }
             }
           ]);
         }
       }
+      // Tag
+      case "tag": {
+        return QueryPlan.Plan.make([
+          {
+            _tag: "SelectStep",
+            spaces: context.selectionSpaces,
+            selector: {
+              _tag: "WildcardSelector"
+            }
+          },
+          ...this._generateDeletedHandlingSteps(context),
+          {
+            _tag: "FilterStep",
+            filter: {
+              ...filter2
+            }
+          }
+        ]);
+      }
+      // Text
       case "text-search": {
         return QueryPlan.Plan.make([
           {
@@ -3120,55 +3172,61 @@ var QueryPlanner = class {
             spaces: context.selectionSpaces,
             selector: {
               _tag: "TextSelector",
-              text: filter.text,
-              searchKind: filter.searchKind ?? this._options.defaultTextSearchKind
+              text: filter2.text,
+              searchKind: filter2.searchKind ?? this._options.defaultTextSearchKind
             }
           },
           ...this._generateDeletedHandlingSteps(context)
         ]);
       }
+      // Compare
       case "compare":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
       case "in":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
       case "range":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
+      // Boolean
       case "not":
-        return this._generateSelectionFromFilter(filter.filter, {
+        return this._generateSelectionFromFilter(filter2.filter, {
           ...context,
           selectionInverted: !context.selectionInverted
         });
       case "and":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
       case "or":
-        if (filter.filters.every(isTrivialTypenameFilter)) {
-          const typenames = filter.filters.map((f) => {
-            invariant9(f.type === "object" && f.typename !== null, void 0, {
+        if (filter2.filters.every(isTrivialTypenameFilter)) {
+          const typenames = filter2.filters.map((filter3) => {
+            invariant9(filter3.type === "object" && filter3.typename !== null, void 0, {
               F: __dxlog_file10,
-              L: 195,
+              L: 224,
               S: this,
               A: [
-                "f.type === 'object' && f.typename !== null",
+                "filter.type === 'object' && filter.typename !== null",
                 ""
               ]
             });
-            return f.typename;
+            return filter3.typename;
           });
           return QueryPlan.Plan.make([
             {
@@ -3183,14 +3241,16 @@ var QueryPlanner = class {
             ...this._generateDeletedHandlingSteps(context)
           ]);
         } else {
-          throw new QueryError("Query too complex", {
+          throw new QueryError({
+            message: "Query too complex",
             context: {
               query: context.originalQuery
             }
           });
         }
       default:
-        throw new QueryError(`Unsupported filter type: ${filter.type}`, {
+        throw new QueryError({
+          message: `Unsupported filter type: ${filter2.type}`,
           context: {
             query: context.originalQuery
           }
@@ -3456,8 +3516,8 @@ var createRelationTraversalStep = (direction) => ({
     direction
   }
 });
-var isTrivialTypenameFilter = (filter) => {
-  return filter.type === "object" && filter.typename !== null && Object.keys(filter.props).length === 0 && (filter.id === void 0 || filter.id.length === 0) && (filter.foreignKeys === void 0 || filter.foreignKeys.length === 0);
+var isTrivialTypenameFilter = (filter2) => {
+  return filter2.type === "object" && filter2.typename !== null && Object.keys(filter2.props).length === 0 && (filter2.id === void 0 || filter2.id.length === 0) && (filter2.foreignKeys === void 0 || filter2.foreignKeys.length === 0);
 };
 
 // src/query/query-executor.ts
@@ -3475,7 +3535,7 @@ function _define_property12(obj, key, value) {
   return obj;
 }
 var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-executor.ts";
-var isNullable = Predicate.isNullable;
+var isNullable2 = Predicate.isNullable;
 var ExecutionTrace = Object.freeze({
   makeEmpty: () => ({
     name: "Empty",
@@ -3483,11 +3543,57 @@ var ExecutionTrace = Object.freeze({
     objectCount: 0,
     documentsLoaded: 0,
     indexHits: 0,
+    beginTs: 0,
+    endTs: 0,
     indexQueryTime: 0,
     documentLoadTime: 0,
     executionTime: 0,
     children: []
   }),
+  markEnd: (trace6) => {
+    trace6.endTs = performance.now();
+    trace6.executionTime = trace6.endTs - trace6.beginTs;
+  },
+  putOnPerformanceTimeline: (trace6) => {
+    performance.measure(trace6.name, {
+      start: trace6.beginTs,
+      end: trace6.endTs,
+      detail: {
+        devtools: {
+          dataType: "track-entry",
+          track: "Query Execution",
+          trackGroup: "ECHO",
+          color: "tertiary-dark",
+          properties: [
+            [
+              "objectCount",
+              trace6.objectCount
+            ],
+            [
+              "documentsLoaded",
+              trace6.documentsLoaded
+            ],
+            [
+              "index hits",
+              trace6.indexHits
+            ],
+            [
+              "indexQueryTime",
+              trace6.indexQueryTime
+            ],
+            [
+              "documentLoadTime",
+              trace6.documentLoadTime
+            ]
+          ],
+          tooltipText: trace6.details
+        }
+      }
+    });
+    for (const child of trace6.children) {
+      ExecutionTrace.putOnPerformanceTimeline(child);
+    }
+  },
   format: (trace6) => {
     const go = (trace7, indent) => {
       return [
@@ -3527,7 +3633,7 @@ var QueryExecutor = class extends Resource6 {
   async execQuery() {
     invariant10(this._lifecycleState === LifecycleState3.OPEN, void 0, {
       F: __dxlog_file11,
-      L: 176,
+      L: 211,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3562,7 +3668,7 @@ var QueryExecutor = class extends Resource6 {
       trace6.children.push(result.trace);
     }
     trace6.objectCount = workingSet.length;
-    trace6.executionTime = performance.now() - begin;
+    ExecutionTrace.markEnd(trace6);
     return {
       workingSet,
       trace: trace6
@@ -3606,7 +3712,8 @@ var QueryExecutor = class extends Resource6 {
       default:
         throw new Error(`Unknown step type: ${step._tag}`);
     }
-    trace6.executionTime = performance.now() - begin;
+    trace6.beginTs = begin;
+    ExecutionTrace.markEnd(trace6);
     return {
       workingSet: newWorkingSet,
       trace: trace6
@@ -3619,7 +3726,8 @@ var QueryExecutor = class extends Resource6 {
     const trace6 = {
       ...ExecutionTrace.makeEmpty(),
       name: "Select",
-      details: JSON.stringify(step.selector)
+      details: JSON.stringify(step.selector),
+      beginTs: performance.now()
     };
     switch (step.selector._tag) {
       case "WildcardSelector": {
@@ -3640,7 +3748,7 @@ var QueryExecutor = class extends Resource6 {
         const results = await this._loadDocumentsAfterIndexQuery(indexHits);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable2).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3650,7 +3758,7 @@ var QueryExecutor = class extends Resource6 {
           sourceSpaceId: step.spaces[0]
         })));
         trace6.documentLoadTime += performance.now() - beginLoad;
-        workingSet.push(...items.filter(isNonNullable2));
+        workingSet.push(...items.filter(isNonNullable3));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3672,7 +3780,7 @@ var QueryExecutor = class extends Resource6 {
         const results = await this._loadDocumentsAfterIndexQuery(indexHits);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable2).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3697,7 +3805,7 @@ var QueryExecutor = class extends Resource6 {
         const results = await this._loadDocumentsAfterIndexQuery(indexHits);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable2).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3767,20 +3875,20 @@ var QueryExecutor = class extends Resource6 {
                     ref: ref2["/"]
                   }, {
                     F: __dxlog_file11,
-                    L: 432,
+                    L: 477,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                   return null;
                 }
               });
-            }).filter(isNonNullable2);
+            }).filter(isNonNullable3);
             const beginLoad = performance.now();
             const items = await Promise.all(refs.map(({ ref, spaceId }) => this._loadFromDXN(ref, {
               sourceSpaceId: spaceId
             })));
             trace6.documentLoadTime += performance.now() - beginLoad;
-            newWorkingSet.push(...items.filter(isNonNullable2));
+            newWorkingSet.push(...items.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3799,7 +3907,7 @@ var QueryExecutor = class extends Resource6 {
             const results = await this._loadDocumentsAfterIndexQuery(indexHits);
             trace6.documentsLoaded += results.length;
             trace6.documentLoadTime += performance.now() - documentLoadStart;
-            newWorkingSet.push(...results.filter(isNonNullable2));
+            newWorkingSet.push(...results.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3825,19 +3933,19 @@ var QueryExecutor = class extends Resource6 {
                   ref: ref["/"]
                 }, {
                   F: __dxlog_file11,
-                  L: 495,
+                  L: 540,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 return null;
               }
-            }).filter(isNonNullable2);
+            }).filter(isNonNullable3);
             const beginLoad = performance.now();
             const items = await Promise.all(refs.map(({ ref, spaceId }) => this._loadFromDXN(ref, {
               sourceSpaceId: spaceId
             })));
             trace6.documentLoadTime += performance.now() - beginLoad;
-            newWorkingSet.push(...items.filter(isNonNullable2));
+            newWorkingSet.push(...items.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3857,7 +3965,7 @@ var QueryExecutor = class extends Resource6 {
             const results = await this._loadDocumentsAfterIndexQuery(indexHits);
             trace6.documentsLoaded += results.length;
             trace6.documentLoadTime += performance.now() - documentLoadStart;
-            newWorkingSet.push(...results.filter(isNonNullable2));
+            newWorkingSet.push(...results.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3950,14 +4058,14 @@ var QueryExecutor = class extends Resource6 {
     return Match.type().pipe(
       Match.withReturnType(),
       Match.when({
-        a: isNullable,
-        b: isNullable
+        a: isNullable2,
+        b: isNullable2
       }, () => 0),
       Match.when({
-        a: isNullable
+        a: isNullable2
       }, () => 1),
       Match.when({
-        b: isNullable
+        b: isNullable2
       }, () => -1),
       Match.when({
         a: Match.string,
@@ -3991,7 +4099,7 @@ var QueryExecutor = class extends Resource6 {
     const { objectId, documentId, spaceKey: spaceKeyInIndex } = objectPointerCodec3.decode(hit.id);
     const handle = await this._automergeHost.loadDoc(Context3.default(void 0, {
       F: __dxlog_file11,
-      L: 659
+      L: 704
     }), documentId);
     const doc = handle.doc();
     if (!doc) {
@@ -4019,7 +4127,7 @@ var QueryExecutor = class extends Resource6 {
         dxn
       }, {
         F: __dxlog_file11,
-        L: 686,
+        L: 731,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4032,7 +4140,7 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file11,
-        L: 694,
+        L: 739,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4044,7 +4152,7 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file11,
-        L: 699,
+        L: 744,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4065,7 +4173,7 @@ var QueryExecutor = class extends Resource6 {
     }
     const handle = await this._automergeHost.loadDoc(Context3.default(void 0, {
       F: __dxlog_file11,
-      L: 718
+      L: 763
     }), link);
     const doc = handle.doc();
     if (!doc) {
@@ -4365,17 +4473,17 @@ import { DatabaseDirectory as DatabaseDirectory5, SpaceDocVersion as SpaceDocVer
 import { invariant as invariant11 } from "@dxos/invariant";
 
 // src/db-host/automerge-metrics.ts
-import * as A4 from "@automerge/automerge";
+import * as A5 from "@automerge/automerge";
 import { log as log11 } from "@dxos/log";
 var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts";
 var measureDocMetrics = (doc) => {
-  const snapshot = A4.save(doc);
+  const snapshot = A5.save(doc);
   const start = Date.now();
-  const temp = A4.load(snapshot);
+  const temp = A5.load(snapshot);
   const end = Date.now();
-  A4.free(temp);
+  A5.free(temp);
   const getAllChangesStart = Date.now();
-  const mutationCount = A4.getAllChanges(doc).length;
+  const mutationCount = A5.getAllChanges(doc).length;
   const getAllChangesEnd = Date.now();
   if (getAllChangesEnd - getAllChangesStart > 300) {
     log11.warn("getAllChanges took too long", {
@@ -4658,7 +4766,7 @@ var EchoHost = class extends Resource9 {
   * Flush all pending writes to the underlying storage.
   */
   async flush() {
-    await this._automergeHost.repo.flush();
+    await this._automergeHost.flush();
   }
   /**
   * Perform any pending index updates.
@@ -4843,6 +4951,7 @@ var EchoHost = class extends Resource9 {
 };
 
 // src/edge/echo-edge-replicator.ts
+import * as Automerge from "@automerge/automerge";
 import { cbor as cbor2 } from "@automerge/automerge-repo";
 import { Mutex, scheduleMicroTask as scheduleMicroTask2, scheduleTask as scheduleTask2 } from "@dxos/async";
 import { Context as Context6, Resource as Resource11 } from "@dxos/context";
@@ -4852,7 +4961,7 @@ import { log as log13 } from "@dxos/log";
 import { DocumentCodec, EdgeService } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema as RouterMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-import { bufferToArray as bufferToArray2 } from "@dxos/util";
+import { bufferToArray as bufferToArray2, setDeep } from "@dxos/util";
 
 // src/edge/inflight-request-limiter.ts
 import { Trigger as Trigger2 } from "@dxos/async";
@@ -5015,14 +5124,14 @@ var EchoEdgeReplicator = class {
       connectedSpaces: this._connectedSpaces.size
     }, {
       F: __dxlog_file18,
-      L: 72,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
     this._ctx = Context6.default(void 0, {
       F: __dxlog_file18,
-      L: 74
+      L: 75
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && scheduleMicroTask2(this._ctx, () => this._handleReconnect());
@@ -5121,7 +5230,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     invariant14(this._context, void 0, {
       F: __dxlog_file18,
-      L: 135,
+      L: 136,
       S: this,
       A: [
         "this._context",
@@ -5130,7 +5239,7 @@ var EchoEdgeReplicator = class {
     });
     invariant14(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file18,
-      L: 136,
+      L: 137,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -5149,7 +5258,7 @@ var EchoEdgeReplicator = class {
           spaceId
         }, {
           F: __dxlog_file18,
-          L: 147,
+          L: 148,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5160,7 +5269,7 @@ var EchoEdgeReplicator = class {
           spaceId
         }, {
           F: __dxlog_file18,
-          L: 151,
+          L: 152,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5177,7 +5286,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file18,
-          L: 162,
+          L: 163,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5205,7 +5314,7 @@ var EchoEdgeReplicator = class {
               restartDelay
             }, {
               F: __dxlog_file18,
-              L: 179,
+              L: 180,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5242,7 +5351,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   async _open(ctx) {
     log13("opening...", void 0, {
       F: __dxlog_file18,
-      L: 270,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5257,7 +5366,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         if (firstReconnect) {
           log13.verbose("first reconnect skipped", void 0, {
             F: __dxlog_file18,
-            L: 285,
+            L: 288,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5272,7 +5381,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   async _close() {
     log13("closing...", void 0, {
       F: __dxlog_file18,
-      L: 298,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5283,7 +5392,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   get peerId() {
     invariant14(this._remotePeerId, "Not connected", {
       F: __dxlog_file18,
-      L: 307,
+      L: 310,
       S: this,
       A: [
         "this._remotePeerId",
@@ -5308,7 +5417,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         remoteId: this._remotePeerId
       }, {
         F: __dxlog_file18,
-        L: 322,
+        L: 325,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5329,12 +5438,11 @@ var EdgeReplicatorConnection = class extends Resource11 {
     }
     const payload = cbor2.decode(message.payload.value);
     log13.verbose("received", {
-      type: payload.type,
-      documentId: payload.type === "sync" && payload.documentId,
+      ...getMessageInfo(payload),
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file18,
-      L: 351,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5365,7 +5473,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
     ]));
   }
   _processMessage(message) {
-    if (isForbiddenErrorMessage(message)) {
+    if (isErrorMessage(message)) {
       this._onRestartRequested();
       return;
     }
@@ -5374,13 +5482,20 @@ var EdgeReplicatorConnection = class extends Resource11 {
   }
   async _sendMessage(message) {
     message.targetId = this._targetServiceId;
+    setDeep(message, [
+      "metadata",
+      "dxos_sequence"
+    ], this._getSequence());
+    setDeep(message, [
+      "metadata",
+      "dxos_connectionId"
+    ], this._connectionId);
     log13.verbose("sending...", {
-      type: message.type,
-      documentId: message.type === "sync" && message.documentId,
+      ...getMessageInfo(message),
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file18,
-      L: 401,
+      L: 407,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5401,14 +5516,17 @@ var EdgeReplicatorConnection = class extends Resource11 {
         err
       }, {
         F: __dxlog_file18,
-        L: 421,
+        L: 426,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
+  _getSequence() {
+    return this._sequence++;
+  }
   constructor({ edgeConnection, edgeHttpClient, spaceId, context, sharedPolicyEnabled, onRemoteConnected, onRemoteDisconnected, onRestartRequested }) {
-    super(), _define_property18(this, "_edgeConnection", void 0), _define_property18(this, "_edgeHttpClient", void 0), _define_property18(this, "_remotePeerId", null), _define_property18(this, "_targetServiceId", void 0), _define_property18(this, "_spaceId", void 0), _define_property18(this, "_context", void 0), _define_property18(this, "_sharedPolicyEnabled", void 0), _define_property18(this, "_onRemoteConnected", void 0), _define_property18(this, "_onRemoteDisconnected", void 0), _define_property18(this, "_onRestartRequested", void 0), _define_property18(this, "_requestLimiter", new InflightRequestLimiter({
+    super(), _define_property18(this, "_connectionId", randomUUID()), _define_property18(this, "_edgeConnection", void 0), _define_property18(this, "_edgeHttpClient", void 0), _define_property18(this, "_remotePeerId", null), _define_property18(this, "_targetServiceId", void 0), _define_property18(this, "_spaceId", void 0), _define_property18(this, "_context", void 0), _define_property18(this, "_sharedPolicyEnabled", void 0), _define_property18(this, "_onRemoteConnected", void 0), _define_property18(this, "_onRemoteDisconnected", void 0), _define_property18(this, "_onRestartRequested", void 0), _define_property18(this, "_sequence", 0), _define_property18(this, "_requestLimiter", new InflightRequestLimiter({
       maxInflightRequests: MAX_INFLIGHT_REQUESTS,
       resetBalanceTimeoutMs: MAX_RATE_LIMIT_WAIT_TIME_MS
     })), _define_property18(this, "_readableStreamController", void 0), _define_property18(this, "readable", void 0), _define_property18(this, "writable", void 0);
@@ -5416,7 +5534,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
     this._edgeHttpClient = edgeHttpClient;
     this._spaceId = spaceId;
     this._context = context;
-    this._remotePeerId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}-${randomUUID()}`;
+    this._remotePeerId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}-${this._connectionId}`;
     this._targetServiceId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`;
     this._sharedPolicyEnabled = sharedPolicyEnabled;
     this._onRemoteConnected = onRemoteConnected;
@@ -5435,7 +5553,19 @@ var EdgeReplicatorConnection = class extends Resource11 {
     });
   }
 };
-var isForbiddenErrorMessage = (message) => message.type === "error" && message.message === "Forbidden";
+var isErrorMessage = (message) => message.type === "error";
+var getMessageInfo = (msg) => {
+  const { have, heads, need, changes } = msg.type === "sync" ? Automerge.decodeSyncMessage(msg.data) : {};
+  return {
+    type: msg.type,
+    documentId: "documentId" in msg ? msg.documentId : void 0,
+    have,
+    heads,
+    need,
+    changes: changes?.length,
+    sequence: msg.metadata?.dxos_sequence
+  };
+};
 
 // src/util.ts
 import { ObjectStructure as ObjectStructure2, decodeReference } from "@dxos/echo-protocol";