@dxos/echo-pipeline 0.8.3 → 0.8.4-main.28f8d3d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.8.3",
+  "version": "0.8.4-main.28f8d3d",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,16 +10,19 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": "./dist/lib/node-esm/testing/index.mjs"
     },
     "./filter": {
+      "source": "./src/filter/index.ts",
       "types": "./dist/types/src/filter/index.d.ts",
       "browser": "./dist/lib/browser/filter/index.mjs",
       "node": "./dist/lib/node-esm/filter/index.mjs"
@@ -40,51 +43,51 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.0.0-beta.4",
-    "@automerge/automerge-repo": "2.0.1",
+    "@automerge/automerge": "3.1.1",
+    "@automerge/automerge-repo": "2.3.0-alpha.0",
     "crc-32": "^1.2.2",
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "level-transcoder": "^1.0.1",
     "lodash.isequal": "^4.5.0",
-    "@dxos/codec-protobuf": "0.8.3",
-    "@dxos/credentials": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/crypto": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/echo": "0.8.3",
-    "@dxos/echo-protocol": "0.8.3",
-    "@dxos/edge-client": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/feed-store": "0.8.3",
-    "@dxos/errors": "0.8.3",
-    "@dxos/indexing": "0.8.3",
-    "@dxos/hypercore": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/keyring": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/kv-store": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/messaging": "0.8.3",
-    "@dxos/network-manager": "0.8.3",
-    "@dxos/node-std": "0.8.3",
-    "@dxos/teleport": "0.8.3",
-    "@dxos/protocols": "0.8.3",
-    "@dxos/random-access-storage": "0.8.3",
-    "@dxos/teleport-extension-automerge-replicator": "0.8.3",
-    "@dxos/teleport-extension-gossip": "0.8.3",
-    "@dxos/teleport-extension-object-sync": "0.8.3",
-    "@dxos/teleport-extension-replicator": "0.8.3",
-    "@dxos/timeframe": "0.8.3",
-    "@dxos/tracing": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/typings": "0.8.3"
+    "@dxos/async": "0.8.4-main.28f8d3d",
+    "@dxos/context": "0.8.4-main.28f8d3d",
+    "@dxos/crypto": "0.8.4-main.28f8d3d",
+    "@dxos/codec-protobuf": "0.8.4-main.28f8d3d",
+    "@dxos/debug": "0.8.4-main.28f8d3d",
+    "@dxos/echo": "0.8.4-main.28f8d3d",
+    "@dxos/credentials": "0.8.4-main.28f8d3d",
+    "@dxos/echo-protocol": "0.8.4-main.28f8d3d",
+    "@dxos/edge-client": "0.8.4-main.28f8d3d",
+    "@dxos/echo-schema": "0.8.4-main.28f8d3d",
+    "@dxos/errors": "0.8.4-main.28f8d3d",
+    "@dxos/feed-store": "0.8.4-main.28f8d3d",
+    "@dxos/hypercore": "0.8.4-main.28f8d3d",
+    "@dxos/indexing": "0.8.4-main.28f8d3d",
+    "@dxos/keyring": "0.8.4-main.28f8d3d",
+    "@dxos/keys": "0.8.4-main.28f8d3d",
+    "@dxos/log": "0.8.4-main.28f8d3d",
+    "@dxos/kv-store": "0.8.4-main.28f8d3d",
+    "@dxos/messaging": "0.8.4-main.28f8d3d",
+    "@dxos/invariant": "0.8.4-main.28f8d3d",
+    "@dxos/network-manager": "0.8.4-main.28f8d3d",
+    "@dxos/node-std": "0.8.4-main.28f8d3d",
+    "@dxos/teleport": "0.8.4-main.28f8d3d",
+    "@dxos/teleport-extension-automerge-replicator": "0.8.4-main.28f8d3d",
+    "@dxos/protocols": "0.8.4-main.28f8d3d",
+    "@dxos/teleport-extension-gossip": "0.8.4-main.28f8d3d",
+    "@dxos/teleport-extension-object-sync": "0.8.4-main.28f8d3d",
+    "@dxos/random-access-storage": "0.8.4-main.28f8d3d",
+    "@dxos/teleport-extension-replicator": "0.8.4-main.28f8d3d",
+    "@dxos/timeframe": "0.8.4-main.28f8d3d",
+    "@dxos/tracing": "0.8.4-main.28f8d3d",
+    "@dxos/typings": "0.8.4-main.28f8d3d",
+    "@dxos/util": "0.8.4-main.28f8d3d"
   },
   "devDependencies": {
     "@types/lodash.isequal": "^4.5.0",
     "fast-check": "^3.19.0",
     "get-port-please": "^3.1.1",
-    "@dxos/test-utils": "0.8.3"
+    "@dxos/test-utils": "0.8.4-main.28f8d3d"
   },
   "publishConfig": {
     "access": "public"

package/src/automerge/automerge-host.test.ts

@@ -4,7 +4,7 @@
 
 import { getHeads } from '@automerge/automerge';
 import type { DocumentId, Heads } from '@automerge/automerge-repo';
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { IndexMetadataStore } from '@dxos/indexing';
 import type { LevelDB } from '@dxos/kv-store';
@@ -12,9 +12,10 @@ import { createTestLevel } from '@dxos/kv-store/testing';
 import { openAndClose } from '@dxos/test-utils';
 import { range } from '@dxos/util';
 
-import { AutomergeHost } from './automerge-host';
 import { TestReplicationNetwork } from '../testing';
 
+import { AutomergeHost } from './automerge-host';
+
 describe('AutomergeHost', () => {
   test('can create documents', async () => {
     const level = await createLevel();

package/src/automerge/automerge-host.ts

@@ -3,32 +3,32 @@
 //
 
 import {
+  type Doc,
+  type Heads,
   getBackend,
   getHeads,
-  isAutomerge,
   equals as headsEquals,
+  isAutomerge,
   save,
-  type Doc,
-  type Heads,
 } from '@automerge/automerge';
 import {
-  type DocHandleChangePayload,
-  Repo,
   type AnyDocumentId,
   type DocHandle,
+  type DocHandleChangePayload,
   type DocumentId,
+  type HandleState,
   type PeerCandidatePayload,
   type PeerDisconnectedPayload,
   type PeerId,
+  Repo,
   type StorageAdapterInterface,
   type StorageKey,
   interpretAsDocumentId,
-  type HandleState,
 } from '@automerge/automerge-repo';
 
 import { Event, asyncTimeout } from '@dxos/async';
-import { Context, Resource, cancelWithContext, type Lifecycle } from '@dxos/context';
-import { DatabaseDirectory, type CollectionId } from '@dxos/echo-protocol';
+import { Context, type Lifecycle, Resource, cancelWithContext } from '@dxos/context';
+import { type CollectionId, DatabaseDirectory } from '@dxos/echo-protocol';
 import { type IndexMetadataStore } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -39,12 +39,12 @@ import { type DocHeadsList, type FlushRequest } from '@dxos/protocols/proto/dxos
 import { trace } from '@dxos/tracing';
 import { bufferToArray } from '@dxos/util';
 
-import { CollectionSynchronizer, diffCollectionState, type CollectionState } from './collection-synchronizer';
+import { type CollectionState, CollectionSynchronizer, diffCollectionState } from './collection-synchronizer';
 import { type EchoDataMonitor } from './echo-data-monitor';
 import { EchoNetworkAdapter, isEchoPeerMetadata } from './echo-network-adapter';
 import { type EchoReplicator, type RemoteDocumentExistenceCheckParams } from './echo-replicator';
 import { HeadsStore } from './heads-store';
-import { LevelDBStorageAdapter, type BeforeSaveParams } from './leveldb-storage-adapter';
+import { type BeforeSaveParams, LevelDBStorageAdapter } from './leveldb-storage-adapter';
 
 export type PeerIdProvider = () => string | undefined;
 
@@ -515,6 +515,16 @@ export class AutomergeHost extends Resource {
       heads.map((heads, index) => [documentIds[index], heads ?? []]),
     );
     this._collectionSynchronizer.setLocalCollectionState(collectionId, { documents });
+
+    // Proactively push our updated local state to peers that are interested in this collection.
+    // This reduces reliance on the next periodic query and prevents replication stalls in fast paths
+    // where the remote queries before our local state is ready.
+    const interestedPeers = this._echoNetworkAdapter.getPeersInterestedInCollection(collectionId);
+    if (interestedPeers.length > 0) {
+      for (const peerId of interestedPeers) {
+        this._sendCollectionState(collectionId, peerId, { documents });
+      }
+    }
   }
 
   async clearLocalCollectionState(collectionId: string): Promise<void> {

package/src/automerge/automerge-repo.test.ts

@@ -3,6 +3,7 @@
 //
 
 import {
+  next as A,
   type Heads,
   change,
   clone,
@@ -10,7 +11,6 @@ import {
   from,
   getBackend,
   getHeads,
-  next as A,
   save,
   saveSince,
 } from '@automerge/automerge';
@@ -19,14 +19,14 @@ import {
   type DocHandle,
   type DocumentId,
   type HandleState,
-  type StorageAdapterInterface,
   type PeerId,
   Repo,
   type SharePolicy,
+  type StorageAdapterInterface,
   generateAutomergeUrl,
   parseAutomergeUrl,
 } from '@automerge/automerge-repo';
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { asyncTimeout, sleep } from '@dxos/async';
 import { randomBytes } from '@dxos/crypto';
@@ -36,11 +36,12 @@ import { TestBuilder as TeleportBuilder, TestPeer as TeleportPeer } from '@dxos/
 import { openAndClose } from '@dxos/test-utils';
 import { isNonNullable, range } from '@dxos/util';
 
+import { TestAdapter, type TestConnectionStateProvider } from '../testing';
+
 import { FIND_PARAMS } from './automerge-host';
 import { EchoNetworkAdapter } from './echo-network-adapter';
 import { LevelDBStorageAdapter } from './leveldb-storage-adapter';
 import { MeshEchoReplicator } from './mesh-echo-replicator';
-import { TestAdapter, type TestConnectionStateProvider } from '../testing';
 
 const HOST_AND_CLIENT: [string, string] = ['host', 'client'];
 
@@ -420,13 +421,7 @@ describe('AutomergeRepo', () => {
 
     test('client creates doc and syncs with a Repo', async () => {
       const repo = new Repo({ network: [] });
-      const receiveByServer = async (blob: Uint8Array, docId: DocumentId) => {
-        const serverHandle = await repo.find(docId, FIND_PARAMS);
-        serverHandle.update((doc) => {
-          return A.loadIncremental(doc, blob);
-        });
-      };
-
+      const receiveByServer = (blob: Uint8Array, docId: DocumentId) => repo.import<any>(blob, { docId });
       let clientDoc = A.from<{ field?: string }>({});
       const { documentId } = parseAutomergeUrl(generateAutomergeUrl());
       // Sync handshake.
@@ -434,7 +429,7 @@ describe('AutomergeRepo', () => {
 
       // Sync protocol.
       const sendDoc = async (doc: A.Doc<any>) => {
-        await receiveByServer(saveSince(doc, sentHeads), documentId);
+        receiveByServer(saveSince(doc, sentHeads), documentId);
         sentHeads = getHeads(doc);
       };
 
@@ -456,10 +451,9 @@ describe('AutomergeRepo', () => {
 
       const repo = new Repo({ network: [], storage });
       const receiveByServer = async (blob: Uint8Array, docId: DocumentId) => {
-        const serverHandle = await repo.find(docId, FIND_PARAMS);
-        serverHandle.update((doc) => {
-          return A.loadIncremental(doc, blob);
-        });
+        repo.import<any>(blob, { docId });
+        // TODO(mykola): This should not be required. Document is not persisted without it.
+        await repo.flush([docId]);
       };
 
       let clientDoc = A.from<{ field?: string }>({ field: 'foo' });
@@ -677,6 +671,63 @@ describe('AutomergeRepo', () => {
       await doc.whenReady();
       expect(doc.doc()).to.deep.eq(document.doc());
     });
+
+    test('document is passively replicated to connected peers', async () => {
+      const [spaceKey] = PublicKey.randomSequence();
+
+      const teleportBuilder = new TeleportBuilder();
+      onTestFinished(() => teleportBuilder.destroy());
+
+      const peer1 = await createTeleportTestPeer(teleportBuilder, spaceKey);
+      const peer2 = await createTeleportTestPeer(teleportBuilder, spaceKey);
+
+      const handle = peer1.repo.create();
+      handle.change((doc: any) => (doc.text = 'hello'));
+      await connectPeers(spaceKey, teleportBuilder, peer1, peer2);
+
+      await expect
+        .poll(async () => {
+          const doc = peer2.repo.handles[handle.documentId];
+          await doc.whenReady();
+          return doc.doc()!.text;
+        })
+        .toEqual('hello');
+    });
+
+    test('imported document is passively replicated to connected peers', async () => {
+      let blob: Uint8Array;
+      let documentId: DocumentId;
+      {
+        const repo = new Repo();
+        const handle = repo.create();
+        handle.change((doc: any) => (doc.text = 'hello'));
+        blob = A.save(handle.doc()!);
+        documentId = handle.documentId;
+      }
+
+      const [spaceKey] = PublicKey.randomSequence();
+
+      const teleportBuilder = new TeleportBuilder();
+      onTestFinished(() => teleportBuilder.destroy());
+
+      const peer1 = await createTeleportTestPeer(teleportBuilder, spaceKey);
+      const peer2 = await createTeleportTestPeer(teleportBuilder, spaceKey);
+      await connectPeers(spaceKey, teleportBuilder, peer1, peer2);
+
+      const handle = peer1.repo.import(blob, { docId: documentId });
+      await handle.whenReady();
+
+      await expect
+        .poll(
+          async () => {
+            const doc = peer2.repo.handles[handle.documentId];
+            await doc.whenReady();
+            return doc.doc()!.text;
+          },
+          { timeout: 1_000 },
+        )
+        .toEqual('hello');
+    });
   });
 
   const createLevelAdapter = async () => {

package/src/automerge/collection-synchronizer.test.ts

@@ -3,11 +3,11 @@
 //
 
 import type { PeerId } from '@automerge/automerge-repo';
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { sleep } from '@dxos/async';
 
-import { CollectionSynchronizer, diffCollectionState, type CollectionState } from './collection-synchronizer';
+import { type CollectionState, CollectionSynchronizer, diffCollectionState } from './collection-synchronizer';
 
 describe('CollectionSynchronizer', () => {
   test('sync two peers', async () => {

package/src/automerge/collection-synchronizer.ts

@@ -5,8 +5,8 @@
 import { next as am } from '@automerge/automerge';
 import type { DocumentId, PeerId } from '@automerge/automerge-repo';
 
-import { asyncReturn, Event, scheduleTask, scheduleTaskInterval } from '@dxos/async';
-import { Resource, type Context } from '@dxos/context';
+import { Event, asyncReturn, scheduleTask, scheduleTaskInterval } from '@dxos/async';
+import { type Context, Resource } from '@dxos/context';
 import { log } from '@dxos/log';
 import { trace } from '@dxos/tracing';
 import { defaultMap } from '@dxos/util';

package/src/automerge/echo-data-monitor.ts

@@ -5,7 +5,7 @@
 import { type Message } from '@automerge/automerge-repo';
 
 import { type TimeAware, trace } from '@dxos/tracing';
-import { CircularBuffer, mapValues, SlidingWindowSummary, type SlidingWindowSummaryConfig } from '@dxos/util';
+import { CircularBuffer, SlidingWindowSummary, type SlidingWindowSummaryConfig, mapValues } from '@dxos/util';
 
 import { type NetworkDataMonitor } from './echo-network-adapter';
 import { type StorageAdapterDataMonitor } from './leveldb-storage-adapter';

package/src/automerge/echo-network-adapter.test.ts

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { cbor, type PeerId } from '@automerge/automerge-repo';
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { type PeerId, cbor } from '@automerge/automerge-repo';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
-import { sleep, Trigger, waitForCondition } from '@dxos/async';
+import { Trigger, sleep, waitForCondition } from '@dxos/async';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { type SyncMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/automerge';

package/src/automerge/echo-network-adapter.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { NetworkAdapter, type Message, type PeerId, type PeerMetadata } from '@automerge/automerge-repo';
+import { type Message, NetworkAdapter, type PeerId, type PeerMetadata } from '@automerge/automerge-repo';
 
-import { synchronized, Trigger } from '@dxos/async';
+import { Trigger, synchronized } from '@dxos/async';
 import { LifecycleState } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
@@ -12,6 +12,8 @@ import { log } from '@dxos/log';
 import type { AutomergeProtocolMessage } from '@dxos/protocols';
 import { isNonNullable } from '@dxos/util';
 
+import { createIdFromSpaceKey } from '../common/space-id';
+
 import {
   type EchoReplicator,
   type RemoteDocumentExistenceCheckParams,
@@ -20,12 +22,11 @@ import {
   type ShouldSyncCollectionParams,
 } from './echo-replicator';
 import {
-  isCollectionQueryMessage,
-  isCollectionStateMessage,
   type CollectionQueryMessage,
   type CollectionStateMessage,
+  isCollectionQueryMessage,
+  isCollectionStateMessage,
 } from './network-protocol';
-import { createIdFromSpaceKey } from '../common/space-id';
 
 export interface NetworkDataMonitor {
   recordPeerConnected(peerId: string): void;
@@ -281,8 +282,9 @@ export class EchoNetworkAdapter extends NetworkAdapter {
     this.emit('peer-disconnected', { peerId: connection.peerId as PeerId });
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
 
-    void entry.reader.cancel().catch((err) => log.catch(err));
     void entry.writer.abort().catch((err) => log.catch(err));
+    void entry.reader.cancel().catch((err) => log.catch(err));
+
     this._connections.delete(connection.peerId as PeerId);
   }
 

package/src/automerge/echo-replicator.ts

@@ -3,8 +3,9 @@
 //
 
 import { type PublicKey, type SpaceId } from '@dxos/keys';
-import type { AutomergeProtocolMessage } from '@dxos/protocols';
+import { type AutomergeProtocolMessage } from '@dxos/protocols';
 
+// TODO(burdon): Rename AutomergeReplicator?
 export interface EchoReplicator {
   /**
    * Called on when replicator is added to EchoHost.

package/src/automerge/index.ts

@@ -5,7 +5,7 @@
 export * from './automerge-host';
 export * from './leveldb-storage-adapter';
 export * from './mesh-echo-replicator';
-export * from './echo-replicator';
+export type * from './echo-replicator';
 export { diffCollectionState } from './collection-synchronizer';
 export * from './space-collection';
 export * from './echo-data-monitor';

package/src/automerge/leveldb-storage-adapter.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 // s
 
-import { type StorageAdapterInterface, type Chunk, type StorageKey } from '@automerge/automerge-repo';
+import { type Chunk, type StorageAdapterInterface, type StorageKey } from '@automerge/automerge-repo';
 import { type MixedEncoding } from 'level-transcoder';
 
 import { LifecycleState, Resource } from '@dxos/context';

package/src/automerge/mesh-echo-replicator.ts

@@ -12,10 +12,11 @@ import {
 } from '@dxos/teleport-extension-automerge-replicator';
 import { ComplexSet, defaultMap } from '@dxos/util';
 
+import { createIdFromSpaceKey } from '../common/space-id';
+
 import { type EchoReplicator, type EchoReplicatorContext, type ShouldAdvertiseParams } from './echo-replicator';
 import { MeshReplicatorConnection } from './mesh-echo-replicator-connection';
 import { getSpaceIdFromCollectionId } from './space-collection';
-import { createIdFromSpaceKey } from '../common/space-id';
 
 // TODO(dmaretskyi): Move out of @dxos/echo-pipeline.
 

package/src/automerge/storage-adapter.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { randomBytes } from '@dxos/crypto';
 import { PublicKey } from '@dxos/keys';

package/src/common/space-id.ts

@@ -18,7 +18,7 @@ export const createIdFromSpaceKey = async (spaceKey: PublicKey): Promise<SpaceId
     return cachedValue;
   }
 
-  const digest = await subtleCrypto.digest('SHA-256', spaceKey.asUint8Array());
+  const digest = await subtleCrypto.digest('SHA-256', spaceKey.asUint8Array() as Uint8Array<ArrayBuffer>);
 
   const bytes = new Uint8Array(digest).slice(0, SpaceId.byteLength);
   const spaceId = SpaceId.encode(bytes);

package/src/db-host/data-service.ts

@@ -11,23 +11,24 @@ import { invariant } from '@dxos/invariant';
 import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import {
+  type BatchedDocumentUpdates,
   type DataService,
   type FlushRequest,
-  type SubscribeRequest,
-  type BatchedDocumentUpdates,
-  type UpdateSubscriptionRequest,
   type GetDocumentHeadsRequest,
   type GetDocumentHeadsResponse,
-  type ReIndexHeadsRequest,
-  type WaitUntilHeadsReplicatedRequest,
-  type UpdateRequest,
   type GetSpaceSyncStateRequest,
+  type ReIndexHeadsRequest,
   type SpaceSyncState,
+  type SubscribeRequest,
+  type UpdateRequest,
+  type UpdateSubscriptionRequest,
+  type WaitUntilHeadsReplicatedRequest,
 } from '@dxos/protocols/proto/dxos/echo/service';
 
+import { type AutomergeHost, deriveCollectionIdFromSpaceId } from '../automerge';
+
 import { DocumentsSynchronizer } from './documents-synchronizer';
 import { type SpaceStateManager } from './space-state-manager';
-import { deriveCollectionIdFromSpaceId, type AutomergeHost } from '../automerge';
 
 export type DataServiceParams = {
   automergeHost: AutomergeHost;

package/src/db-host/database-root.ts

@@ -3,12 +3,12 @@
 //
 
 import type * as A from '@automerge/automerge';
-import { interpretAsDocumentId, type AutomergeUrl, type DocHandle, type DocumentId } from '@automerge/automerge-repo';
+import { type AutomergeUrl, type DocHandle, type DocumentId, interpretAsDocumentId } from '@automerge/automerge-repo';
 
 import { DatabaseDirectory, SpaceDocVersion } from '@dxos/echo-protocol';
 import { invariant } from '@dxos/invariant';
 
-import { measureDocMetrics, type DocMetrics } from './automerge-metrics';
+import { type DocMetrics, measureDocMetrics } from './automerge-metrics';
 
 export class DatabaseRoot {
   static mapLinks(doc: DocHandle<DatabaseDirectory>, mapping: Record<DocumentId, DocumentId>): void {

package/src/db-host/documents-synchronizer.test.ts

@@ -3,7 +3,7 @@
 //
 
 import { next as A } from '@automerge/automerge';
-import { generateAutomergeUrl, parseAutomergeUrl, Repo } from '@automerge/automerge-repo';
+import { Repo, generateAutomergeUrl, parseAutomergeUrl } from '@automerge/automerge-repo';
 import { describe, expect, test } from 'vitest';
 
 import { sleep } from '@dxos/async';