@dxos/client-services 0.3.8 → 0.3.9-main.03b62b6

package/dist/types/src/packlets/spaces/data-space-manager.d.ts

@@ -1,6 +1,6 @@
 import { Event } from '@dxos/async';
 import { type CredentialSigner } from '@dxos/credentials';
-import { type DataServiceSubscriptions, type MetadataStore, type SpaceManager } from '@dxos/echo-pipeline';
+import { type AutomergeHost, type DataServiceSubscriptions, type MetadataStore, type SpaceManager } from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
@@ -37,12 +37,13 @@ export declare class DataSpaceManager {
     private readonly _keyring;
     private readonly _signingContext;
     private readonly _feedStore;
+    private readonly _automergeHost?;
     private readonly _ctx;
     readonly updated: Event<void>;
     private readonly _spaces;
     private _isOpen;
     private readonly _instanceId;
-    constructor(_spaceManager: SpaceManager, _metadataStore: MetadataStore, _dataServiceSubscriptions: DataServiceSubscriptions, _keyring: Keyring, _signingContext: SigningContext, _feedStore: FeedStore<FeedMessage>);
+    constructor(_spaceManager: SpaceManager, _metadataStore: MetadataStore, _dataServiceSubscriptions: DataServiceSubscriptions, _keyring: Keyring, _signingContext: SigningContext, _feedStore: FeedStore<FeedMessage>, _automergeHost?: AutomergeHost | undefined);
     get spaces(): ComplexMap<PublicKey, DataSpace>;
     open(): Promise<void>;
     close(): Promise<void>;

package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAA4B,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,aAAa,EAAc,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACvH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEpG,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,UAAU,EAA+B,MAAM,YAAY,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzC,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5D,UAAU,EAAE,MAAM,eAAe,GAAG,SAAS,CAAC;CAC/C;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,cAAc,EAAE,SAAS,CAAC;IAE1B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAE7B;;;OAGG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B,CAAC;AAEF,qBACa,gBAAgB;IAWzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAf7B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,SAAgB,OAAO,cAAe;IAEtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwD;IAEhF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAGvC,aAAa,EAAE,YAAY,EAC3B,cAAc,EAAE,aAAa,EAC7B,yBAAyB,EAAE,wBAAwB,EACnD,QAAQ,EAAE,OAAO,EACjB,eAAe,EAAE,cAAc,EAC/B,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC;IAIrD,IAAI,MAAM,qCAET;IAGK,IAAI;IA2BJ,KAAK;IASX;;OAEG;IAEG,WAAW;IA+BX,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAoB/D;;;;OAIG;IACG,mBAAmB,CAAC,QAAQ,EAAE,SAAS;YAU/B,eAAe;CAwF9B"}
+{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAA4B,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,mBAAmB,CAAC;AAClF,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,wBAAwB,EAC7B,KAAK,aAAa,EAElB,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEpG,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,UAAU,EAA+B,MAAM,YAAY,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzC,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5D,UAAU,EAAE,MAAM,eAAe,GAAG,SAAS,CAAC;CAC/C;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,cAAc,EAAE,SAAS,CAAC;IAE1B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAE7B;;;OAGG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B,CAAC;AAEF,qBACa,gBAAgB;IAWzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAG3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAlBlC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,SAAgB,OAAO,cAAe;IAEtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwD;IAEhF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAGvC,aAAa,EAAE,YAAY,EAC3B,cAAc,EAAE,aAAa,EAC7B,yBAAyB,EAAE,wBAAwB,EACnD,QAAQ,EAAE,OAAO,EACjB,eAAe,EAAE,cAAc,EAC/B,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAGlC,cAAc,CAAC,2BAAe;IAIjD,IAAI,MAAM,qCAET;IAGK,IAAI;IA2BJ,KAAK;IASX;;OAEG;IAEG,WAAW;IA+BX,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAoB/D;;;;OAIG;IACG,mBAAmB,CAAC,QAAQ,EAAE,SAAS;YAU/B,eAAe;CAyF9B"}

package/dist/types/src/packlets/spaces/data-space.d.ts

@@ -1,5 +1,5 @@
 import { Event } from '@dxos/async';
-import { type MetadataStore, type Space, type DataPipeline } from '@dxos/echo-pipeline';
+import { type MetadataStore, type Space, type DataPipeline, type CreateEpochOptions, type AutomergeHost } from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
@@ -9,6 +9,7 @@ import { type SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
 import { type Gossip, type Presence } from '@dxos/teleport-extension-gossip';
+import { AutomergeSpaceState } from './automerge-space-state';
 import { type SigningContext } from './data-space-manager';
 import { NotarizationPlugin } from './notarization-plugin';
 import { TrustedKeySetAuthVerifier } from '../identity';
@@ -37,6 +38,7 @@ export type DataSpaceParams = {
     signingContext: SigningContext;
     callbacks?: DataSpaceCallbacks;
     cache?: SpaceCache;
+    automergeHost?: AutomergeHost;
 };
 export declare class DataSpace {
     private _ctx;
@@ -50,6 +52,8 @@ export declare class DataSpace {
     private readonly _notarizationPlugin;
     private readonly _callbacks;
     private readonly _cache?;
+    private readonly _automergeHost?;
+    private readonly _automergeSpaceState;
     private _state;
     /**
      * Error for _state === SpaceState.ERROR.
@@ -67,6 +71,7 @@ export declare class DataSpace {
     get presence(): Presence;
     get notarizationPlugin(): NotarizationPlugin;
     get cache(): SpaceCache | undefined;
+    get automergeSpaceState(): AutomergeSpaceState;
     open(): Promise<void>;
     private _open;
     close(): Promise<void>;
@@ -83,7 +88,7 @@ export declare class DataSpace {
     private _initializeAndReadControlPipeline;
     private _createWritableFeeds;
     updateOwnProfile(profile: ProfileDocument): Promise<void>;
-    createEpoch(): Promise<void>;
+    createEpoch(options?: CreateEpochOptions): Promise<void>;
     activate(): Promise<void>;
     deactivate(): Promise<void>;
 }

package/dist/types/src/packlets/spaces/data-space.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"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"}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.3.8";
+export declare const DXOS_VERSION = "0.3.9-main.03b62b6";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/src/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,UAAU,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,uBAAuB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.3.8",
+  "version": "0.3.9-main.03b62b6",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,44 +22,44 @@
   ],
   "dependencies": {
     "platform": "^1.3.6",
-    "@dxos/async": "0.3.8",
-    "@dxos/client-protocol": "0.3.8",
-    "@dxos/codec-protobuf": "0.3.8",
-    "@dxos/config": "0.3.8",
-    "@dxos/context": "0.3.8",
-    "@dxos/credentials": "0.3.8",
-    "@dxos/crypto": "0.3.8",
-    "@dxos/debug": "0.3.8",
-    "@dxos/document-model": "0.3.8",
-    "@dxos/echo-pipeline": "0.3.8",
-    "@dxos/echo-db": "0.3.8",
-    "@dxos/invariant": "0.3.8",
-    "@dxos/echo-schema": "0.3.8",
-    "@dxos/keyring": "0.3.8",
-    "@dxos/feed-store": "0.3.8",
-    "@dxos/keys": "0.3.8",
-    "@dxos/log": "0.3.8",
-    "@dxos/lock-file": "0.3.8",
-    "@dxos/messaging": "0.3.8",
-    "@dxos/model-factory": "0.3.8",
-    "@dxos/network-manager": "0.3.8",
-    "@dxos/node-std": "0.3.8",
-    "@dxos/random-access-storage": "0.3.8",
-    "@dxos/protocols": "0.3.8",
-    "@dxos/rpc": "0.3.8",
-    "@dxos/teleport": "0.3.8",
-    "@dxos/teleport-extension-gossip": "0.3.8",
-    "@dxos/teleport-extension-object-sync": "0.3.8",
-    "@dxos/timeframe": "0.3.8",
-    "@dxos/text-model": "0.3.8",
-    "@dxos/tracing": "0.3.8",
-    "@dxos/util": "0.3.8",
-    "@dxos/websocket-rpc": "0.3.8"
+    "@dxos/codec-protobuf": "0.3.9-main.03b62b6",
+    "@dxos/async": "0.3.9-main.03b62b6",
+    "@dxos/client-protocol": "0.3.9-main.03b62b6",
+    "@dxos/context": "0.3.9-main.03b62b6",
+    "@dxos/credentials": "0.3.9-main.03b62b6",
+    "@dxos/crypto": "0.3.9-main.03b62b6",
+    "@dxos/debug": "0.3.9-main.03b62b6",
+    "@dxos/config": "0.3.9-main.03b62b6",
+    "@dxos/echo-db": "0.3.9-main.03b62b6",
+    "@dxos/echo-pipeline": "0.3.9-main.03b62b6",
+    "@dxos/echo-schema": "0.3.9-main.03b62b6",
+    "@dxos/document-model": "0.3.9-main.03b62b6",
+    "@dxos/feed-store": "0.3.9-main.03b62b6",
+    "@dxos/invariant": "0.3.9-main.03b62b6",
+    "@dxos/keyring": "0.3.9-main.03b62b6",
+    "@dxos/lock-file": "0.3.9-main.03b62b6",
+    "@dxos/keys": "0.3.9-main.03b62b6",
+    "@dxos/log": "0.3.9-main.03b62b6",
+    "@dxos/messaging": "0.3.9-main.03b62b6",
+    "@dxos/model-factory": "0.3.9-main.03b62b6",
+    "@dxos/network-manager": "0.3.9-main.03b62b6",
+    "@dxos/protocols": "0.3.9-main.03b62b6",
+    "@dxos/random-access-storage": "0.3.9-main.03b62b6",
+    "@dxos/node-std": "0.3.9-main.03b62b6",
+    "@dxos/rpc": "0.3.9-main.03b62b6",
+    "@dxos/teleport-extension-gossip": "0.3.9-main.03b62b6",
+    "@dxos/teleport": "0.3.9-main.03b62b6",
+    "@dxos/teleport-extension-object-sync": "0.3.9-main.03b62b6",
+    "@dxos/text-model": "0.3.9-main.03b62b6",
+    "@dxos/tracing": "0.3.9-main.03b62b6",
+    "@dxos/util": "0.3.9-main.03b62b6",
+    "@dxos/websocket-rpc": "0.3.9-main.03b62b6",
+    "@dxos/timeframe": "0.3.9-main.03b62b6"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.3.8"
+    "@dxos/signal": "0.3.9-main.03b62b6"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/services/service-context.ts

@@ -12,6 +12,7 @@ import {
   SpaceManager,
   DataServiceSubscriptions,
   SnapshotStore,
+  AutomergeHost,
 } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
@@ -60,6 +61,7 @@ export class ServiceContext {
   public readonly spaceManager: SpaceManager;
   public readonly identityManager: IdentityManager;
   public readonly invitations: InvitationsHandler;
+  public readonly automergeHost: AutomergeHost;
 
   // Initialized after identity is initialized.
   public dataSpaceManager?: DataSpaceManager;
@@ -107,6 +109,8 @@ export class ServiceContext {
 
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
 
+    this.automergeHost = new AutomergeHost(storage.createDirectory('automerge'));
+
     this.invitations = new InvitationsHandler(this.networkManager);
 
     // TODO(burdon): _initialize called in multiple places.
@@ -215,6 +219,7 @@ export class ServiceContext {
       this.keyring,
       signingContext,
       this.feedStore,
+      this.automergeHost,
     );
     await this.dataSpaceManager.open();
 

package/src/packlets/services/service-host.ts

@@ -282,7 +282,10 @@ export class ClientServicesHost {
         },
       ),
 
-      DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      DataService: new DataServiceImpl(
+        this._serviceContext.dataServiceSubscriptions,
+        this._serviceContext.automergeHost,
+      ),
 
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
 

package/src/packlets/spaces/automerge-space-state.ts

@@ -0,0 +1,22 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type CredentialProcessor, type SpecificCredential, checkCredentialType } from '@dxos/credentials';
+import { type Credential, type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
+
+export class AutomergeSpaceState implements CredentialProcessor {
+  public rootUrl: string | undefined = undefined;
+  public lastEpoch: SpecificCredential<Epoch> | undefined = undefined;
+
+  async processCredential(credential: Credential) {
+    if (!checkCredentialType(credential, 'dxos.halo.credentials.Epoch')) {
+      return;
+    }
+
+    this.lastEpoch = credential;
+    if (credential.subject.assertion.automergeRoot) {
+      this.rootUrl = credential.subject.assertion.automergeRoot;
+    }
+  }
+}

package/src/packlets/spaces/data-space-manager.ts

@@ -5,7 +5,13 @@
 import { Event, synchronized, trackLeaks } from '@dxos/async';
 import { cancelWithContext, Context } from '@dxos/context';
 import { type CredentialSigner, getCredentialAssertion } from '@dxos/credentials';
-import { type DataServiceSubscriptions, type MetadataStore, type Space, type SpaceManager } from '@dxos/echo-pipeline';
+import {
+  type AutomergeHost,
+  type DataServiceSubscriptions,
+  type MetadataStore,
+  type Space,
+  type SpaceManager,
+} from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
@@ -71,6 +77,9 @@ export class DataSpaceManager {
     private readonly _keyring: Keyring,
     private readonly _signingContext: SigningContext,
     private readonly _feedStore: FeedStore<FeedMessage>,
+
+    // TODO(dmaretskyi): Make required.
+    private readonly _automergeHost?: AutomergeHost,
   ) {}
 
   // TODO(burdon): Remove.
@@ -257,6 +266,7 @@ export class DataSpaceManager {
         },
       },
       cache: metadata.cache,
+      automergeHost: this._automergeHost,
     });
 
     if (metadata.state !== SpaceState.INACTIVE) {

package/src/packlets/spaces/data-space.ts

@@ -6,22 +6,35 @@ import { Event, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/asyn
 import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { cancelWithContext, Context } from '@dxos/context';
 import { timed } from '@dxos/debug';
-import { type MetadataStore, type Space, createMappedFeedWriter, type DataPipeline } from '@dxos/echo-pipeline';
+import {
+  type MetadataStore,
+  type Space,
+  createMappedFeedWriter,
+  type DataPipeline,
+  type CreateEpochOptions,
+  type AutomergeHost,
+} from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { CancelledError, SystemError } from '@dxos/protocols';
-import { SpaceState, type Space as SpaceProto } from '@dxos/protocols/proto/dxos/client/services';
+import { SpaceState, type Space as SpaceProto, CreateEpochRequest } from '@dxos/protocols/proto/dxos/client/services';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { AdmittedFeed, type ProfileDocument, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
+import {
+  AdmittedFeed,
+  type ProfileDocument,
+  type Credential,
+  type Epoch,
+} from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
 import { type Gossip, type Presence } from '@dxos/teleport-extension-gossip';
 import { Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
 import { ComplexSet } from '@dxos/util';
 
+import { AutomergeSpaceState } from './automerge-space-state';
 import { type SigningContext } from './data-space-manager';
 import { NotarizationPlugin } from './notarization-plugin';
 import { TrustedKeySetAuthVerifier } from '../identity';
@@ -54,6 +67,9 @@ export type DataSpaceParams = {
   signingContext: SigningContext;
   callbacks?: DataSpaceCallbacks;
   cache?: SpaceCache;
+
+  // TODO(dmaretskyi): Make required.
+  automergeHost?: AutomergeHost;
 };
 
 /**
@@ -74,7 +90,11 @@ export class DataSpace {
   private readonly _signingContext: SigningContext;
   private readonly _notarizationPlugin = new NotarizationPlugin();
   private readonly _callbacks: DataSpaceCallbacks;
-  private readonly _cache?: SpaceCache;
+  private readonly _cache?: SpaceCache = undefined;
+  private readonly _automergeHost?: AutomergeHost = undefined;
+
+  // TODO(dmaretskyi): Move into Space?
+  private readonly _automergeSpaceState = new AutomergeSpaceState();
 
   private _state = SpaceState.CLOSED;
 
@@ -151,6 +171,10 @@ export class DataSpace {
     return this._cache;
   }
 
+  get automergeSpaceState() {
+    return this._automergeSpaceState;
+  }
+
   @synchronized
   async open() {
     await this._open();
@@ -160,6 +184,7 @@ export class DataSpace {
     await this._gossip.open();
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
+    await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new Context());
     this._state = SpaceState.CONTROL_ONLY;
     log('new state', { state: SpaceState[this._state] });
@@ -183,6 +208,7 @@ export class DataSpace {
     await this.authVerifier.close();
 
     await this._inner.close();
+    await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
     await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
     await this._notarizationPlugin.close();
 
@@ -350,8 +376,29 @@ export class DataSpace {
     await this.inner.controlPipeline.writer.write({ credential: { credential } });
   }
 
-  async createEpoch() {
-    const epoch = await this.dataPipeline.createEpoch();
+  async createEpoch(options?: CreateEpochOptions) {
+    let epoch: Epoch | undefined;
+    switch (options?.migration) {
+      case undefined:
+      case CreateEpochRequest.Migration.NONE:
+        {
+          epoch = await this.dataPipeline.createEpoch();
+        }
+        break;
+      case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+        const document = this._automergeHost?.repo.create();
+        epoch = {
+          previousId: this._automergeSpaceState.lastEpoch?.id,
+          number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+          timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe(),
+          automergeRoot: document?.url,
+        };
+      }
+    }
+
+    if (!epoch) {
+      return;
+    }
 
     const receipt = await this.inner.controlPipeline.writer.write({
       credential: {

package/src/version.ts

@@ -1,5 +1 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export const DXOS_VERSION = '0.3.8'; // {x-release-please-version}
+export const DXOS_VERSION = "0.3.9-main.03b62b6";