@livestore/common 0.3.0-dev.5 → 0.3.0-dev.50

package/dist/leader-thread/connection.d.ts

@@ -1,11 +1,39 @@
 import { Effect } from '@livestore/utils/effect';
-import type { SynchronousDatabase } from '../adapter-types.js';
+import type { SqliteDb } from '../adapter-types.js';
 import { SqliteError } from '../adapter-types.js';
 import type { BindValues } from '../sql-queries/index.js';
 import type { PreparedBindValues } from '../util.js';
-export declare const configureConnection: (syncDb: SynchronousDatabase, { fkEnabled }: {
-    fkEnabled: boolean;
-}) => Effect.Effect<void, SqliteError, never>;
-export declare const execSql: (syncDb: SynchronousDatabase, sql: string, bind: BindValues) => Effect.Effect<void, SqliteError, never>;
-export declare const execSqlPrepared: (syncDb: SynchronousDatabase, sql: string, bindValues: PreparedBindValues) => Effect.Effect<void, SqliteError, never>;
+type ConnectionOptions = {
+    /**
+     * The database connection locking mode.
+     *
+     * @remarks
+     *
+     * This **option is ignored** when used on an **in-memory database** as they can only operate in exclusive locking mode.
+     * In-memory databases can’t share state between connections (unless using a
+     * {@link https://www.sqlite.org/sharedcache.html#shared_cache_and_in_memory_databases|shared cache}),
+     * making concurrent access impossible. This is functionally equivalent to exclusive locking.
+     *
+     * @defaultValue
+     * The default is `"NORMAL"` unless it was unless overridden at compile-time using `SQLITE_DEFAULT_LOCKING_MODE`.
+     *
+     * @see {@link https://www.sqlite.org/pragma.html#pragma_locking_mode|`locking_mode` pragma}
+     */
+    lockingMode?: 'NORMAL' | 'EXCLUSIVE';
+    /**
+     * Whether to enforce foreign key constraints.
+     *
+     * @privateRemarks
+     *
+     * We require a value for this option to minimize future problems, as the default value might change in future
+     * versions of SQLite.
+     *
+     * @see {@link https://www.sqlite.org/pragma.html#pragma_foreign_keys|`foreign_keys` pragma}
+     */
+    foreignKeys: boolean;
+};
+export declare const configureConnection: (sqliteDb: SqliteDb, { foreignKeys, lockingMode }: ConnectionOptions) => Effect.Effect<void, SqliteError, never>;
+export declare const execSql: (sqliteDb: SqliteDb, sql: string, bind: BindValues) => Effect.Effect<void, SqliteError, never>;
+export declare const execSqlPrepared: (sqliteDb: SqliteDb, sql: string, bindValues: PreparedBindValues) => Effect.Effect<void, SqliteError, never>;
+export {};
 //# sourceMappingURL=connection.d.ts.map

package/dist/leader-thread/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAQpD,eAAO,MAAM,mBAAmB,WAAY,mBAAmB,iBAAiB;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,4CASnG,CAAA;AAEH,eAAO,MAAM,OAAO,WAAY,mBAAmB,OAAO,MAAM,QAAQ,UAAU,4CAajF,CAAA;AAYD,eAAO,MAAM,eAAe,WAAY,mBAAmB,OAAO,MAAM,cAAc,kBAAkB,4CAgBvG,CAAA"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAQpD,KAAK,iBAAiB,GAAG;IACvB;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAA;IAEpC;;;;;;;;;OASG;IACH,WAAW,EAAE,OAAO,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,UAAU,QAAQ,EAAE,8BAA8B,iBAAiB,4CAuBpG,CAAA;AAEH,eAAO,MAAM,OAAO,GAAI,UAAU,QAAQ,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,4CAaxE,CAAA;AAYD,eAAO,MAAM,eAAe,GAAI,UAAU,QAAQ,EAAE,KAAK,MAAM,EAAE,YAAY,kBAAkB,4CAgB9F,CAAA"}

package/dist/leader-thread/connection.js

@@ -2,15 +2,30 @@
 import { Effect } from '@livestore/utils/effect';
 import { SqliteError } from '../adapter-types.js';
 import { prepareBindValues, sql } from '../util.js';
-export const configureConnection = (syncDb, { fkEnabled }) => execSql(syncDb, sql `
+export const configureConnection = (sqliteDb, { foreignKeys, lockingMode }) => execSql(sqliteDb, 
+// We use the WAL journal mode is significantly faster in most scenarios than the traditional rollback journal mode.
+// It specifically significantly improves write performance. However, when using the WAL journal mode, transactions
+// that involve changes against multiple ATTACHed databases are atomic for each database but are not atomic
+// across all databases as a set. Additionally, it is not possible to change the page size after entering WAL mode,
+// whether on an empty database or by using VACUUM or the backup API. To change the page size, we must switch to the
+// rollback journal mode.
+//
+// When connected to an in-memory database, the WAL journal mode option is ignored because an in-memory database can
+// only be in either the MEMORY or OFF options. By default, an in-memory database is in the MEMORY option, which
+// means that it stores the rollback journal in volatile RAM. This saves disk I/O but at the expense of safety and
+// integrity. If the thread using SQLite crashes in the middle of a transaction, then the database file will very
+// likely go corrupt.
+sql `
+    -- disable WAL until we have it working properly
+    -- PRAGMA journal_mode=WAL;
     PRAGMA page_size=8192;
-    PRAGMA journal_mode=MEMORY;
-    ${fkEnabled ? sql `PRAGMA foreign_keys='ON';` : sql `PRAGMA foreign_keys='OFF';`}
+    PRAGMA foreign_keys=${foreignKeys ? 'ON' : 'OFF'};
+    ${lockingMode === undefined ? '' : sql `PRAGMA locking_mode=${lockingMode};`}
   `, {});
-export const execSql = (syncDb, sql, bind) => {
+export const execSql = (sqliteDb, sql, bind) => {
     const bindValues = prepareBindValues(bind, sql);
     return Effect.try({
-        try: () => syncDb.execute(sql, bindValues),
+        try: () => sqliteDb.execute(sql, bindValues),
         catch: (cause) => new SqliteError({ cause, query: { bindValues, sql }, code: cause.code }),
     }).pipe(Effect.asVoid, 
     // Effect.logDuration(`@livestore/common:execSql:${sql}`),
@@ -27,9 +42,9 @@ export const execSql = (syncDb, sql, bind) => {
 //   })
 // }
 // TODO actually use prepared statements
-export const execSqlPrepared = (syncDb, sql, bindValues) => {
+export const execSqlPrepared = (sqliteDb, sql, bindValues) => {
     return Effect.try({
-        try: () => syncDb.execute(sql, bindValues),
+        try: () => sqliteDb.execute(sql, bindValues),
         catch: (cause) => new SqliteError({ cause, query: { bindValues, sql }, code: cause.code }),
     }).pipe(Effect.asVoid, 
     // Effect.logDuration(`@livestore/common:execSqlPrepared:${sql}`),

package/dist/leader-thread/connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGjD,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAOnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAA2B,EAAE,EAAE,SAAS,EAA0B,EAAE,EAAE,CACxG,OAAO,CACL,MAAM,EACN,GAAG,CAAA;;;MAGD,SAAS,CAAC,CAAC,CAAC,GAAG,CAAA,2BAA2B,CAAC,CAAC,CAAC,GAAG,CAAA,4BAA4B;GAC/E,EACC,EAAE,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,MAA2B,EAAE,GAAW,EAAE,IAAgB,EAAE,EAAE;IACpF,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC/C,OAAO,MAAM,CAAC,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;QAC1C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,EAAG,KAA8B,CAAC,IAAI,EAAE,CAAC;KACrG,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM;IACb,0DAA0D;IAC1D,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE;QAC3C,UAAU,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;KAC/E,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAED,gFAAgF;AAChF,yDAAyD;AACzD,wBAAwB;AACxB,6CAA6C;AAC7C,wBAAwB;AACxB,sHAAsH;AACtH,OAAO;AACP,IAAI;AAEJ,wCAAwC;AACxC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAA2B,EAAE,GAAW,EAAE,UAA8B,EAAE,EAAE;IAC1G,OAAO,MAAM,CAAC,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;QAC1C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,EAAG,KAA8B,CAAC,IAAI,EAAE,CAAC;KACrG,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM;IACb,kEAAkE;IAClE,MAAM,CAAC,QAAQ,CAAC,mCAAmC,EAAE;QACnD,UAAU,EAAE;YACV,YAAY,EAAE,GAAG;YACjB,GAAG;YACH,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SACvC;KACF,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGjD,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAsCnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAkB,EAAE,EAAE,WAAW,EAAE,WAAW,EAAqB,EAAE,EAAE,CACzG,OAAO,CACL,QAAQ;AACR,oHAAoH;AACpH,mHAAmH;AACnH,2GAA2G;AAC3G,mHAAmH;AACnH,oHAAoH;AACpH,yBAAyB;AACzB,EAAE;AACF,oHAAoH;AACpH,gHAAgH;AAChH,kHAAkH;AAClH,iHAAiH;AACjH,qBAAqB;AACrB,GAAG,CAAA;;;;0BAImB,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;MAC9C,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA,uBAAuB,WAAW,GAAG;GAC5E,EACC,EAAE,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,QAAkB,EAAE,GAAW,EAAE,IAAgB,EAAE,EAAE;IAC3E,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC/C,OAAO,MAAM,CAAC,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;QAC5C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,EAAG,KAA8B,CAAC,IAAI,EAAE,CAAC;KACrG,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM;IACb,0DAA0D;IAC1D,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE;QAC3C,UAAU,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;KAC/E,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAED,gFAAgF;AAChF,yDAAyD;AACzD,wBAAwB;AACxB,6CAA6C;AAC7C,wBAAwB;AACxB,sHAAsH;AACtH,OAAO;AACP,IAAI;AAEJ,wCAAwC;AACxC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAkB,EAAE,GAAW,EAAE,UAA8B,EAAE,EAAE;IACjG,OAAO,MAAM,CAAC,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;QAC5C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,EAAG,KAA8B,CAAC,IAAI,EAAE,CAAC;KACrG,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM;IACb,kEAAkE;IAClE,MAAM,CAAC,QAAQ,CAAC,mCAAmC,EAAE;QACnD,UAAU,EAAE;YACV,YAAY,EAAE,GAAG;YACjB,GAAG;YACH,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SACvC;KACF,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}

package/dist/leader-thread/eventlog.d.ts

@@ -0,0 +1,27 @@
+import { Effect, Option, Schema } from '@livestore/utils/effect';
+import type { SqliteDb } from '../adapter-types.js';
+import * as EventSequenceNumber from '../schema/EventSequenceNumber.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
+import { LeaderThreadCtx } from './types.js';
+export declare const initEventlogDb: (dbEventlog: SqliteDb) => Effect.Effect<void, import("../adapter-types.js").SqliteError, never>;
+/** Exclusive of the "since event" */
+export declare const getEventsSince: (since: EventSequenceNumber.EventSequenceNumber) => Effect.Effect<ReadonlyArray<LiveStoreEvent.EncodedWithMeta>, never, LeaderThreadCtx>;
+export declare const getClientHeadFromDb: (dbEventlog: SqliteDb) => EventSequenceNumber.EventSequenceNumber;
+export declare const getBackendHeadFromDb: (dbEventlog: SqliteDb) => EventSequenceNumber.GlobalEventSequenceNumber;
+export declare const updateBackendHead: (dbEventlog: SqliteDb, head: EventSequenceNumber.EventSequenceNumber) => void;
+export declare const insertIntoEventlog: (eventEncoded: LiveStoreEvent.EncodedWithMeta, dbEventlog: SqliteDb, eventDefSchemaHash: number, clientId: string, sessionId: string) => Effect.Effect<void, import("../adapter-types.js").SqliteError, never>;
+export declare const updateSyncMetadata: (items: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>) => Effect.Effect<void, import("../adapter-types.js").SqliteError, LeaderThreadCtx>;
+export declare const getSyncBackendCursorInfo: (remoteHead: EventSequenceNumber.GlobalEventSequenceNumber) => Effect.Effect<Option.None<{
+    cursor: {
+        global: EventSequenceNumber.GlobalEventSequenceNumber;
+        client: EventSequenceNumber.ClientEventSequenceNumber;
+    };
+    metadata: Option.Option<Schema.JsonValue>;
+}> | Option.Some<{
+    cursor: {
+        global: EventSequenceNumber.GlobalEventSequenceNumber;
+        client: EventSequenceNumber.ClientEventSequenceNumber;
+    };
+    metadata: Option.Option<Schema.JsonValue>;
+}>, never, LeaderThreadCtx>;
+//# sourceMappingURL=eventlog.d.ts.map

package/dist/leader-thread/eventlog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"eventlog.d.ts","sourceRoot":"","sources":["../../src/leader-thread/eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,mBAAmB,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAc7D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,cAAc,GAAI,YAAY,QAAQ,0EAmB/C,CAAA;AAEJ,qCAAqC;AACrC,eAAO,MAAM,cAAc,GACzB,OAAO,mBAAmB,CAAC,mBAAmB,KAC7C,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,eAAe,CA8ClF,CAAA;AAEJ,eAAO,MAAM,mBAAmB,GAAI,YAAY,QAAQ,KAAG,mBAAmB,CAAC,mBAS9E,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,YAAY,QAAQ,KAAG,mBAAmB,CAAC,yBAGjC,CAAA;AAG/C,eAAO,MAAM,iBAAiB,GAAI,YAAY,QAAQ,EAAE,MAAM,mBAAmB,CAAC,mBAAmB,SACrB,CAAA;AAEhF,eAAO,MAAM,kBAAkB,GAC7B,cAAc,cAAc,CAAC,eAAe,EAC5C,YAAY,QAAQ,EACpB,oBAAoB,MAAM,EAC1B,UAAU,MAAM,EAChB,WAAW,MAAM,0EAsCf,CAAA;AAEJ,eAAO,MAAM,kBAAkB,GAAI,OAAO,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,oFAkBnF,CAAA;AAEJ,eAAO,MAAM,wBAAwB,GAAI,YAAY,mBAAmB,CAAC,yBAAyB;;;;;;;;;;;;2BAoBe,CAAA"}

package/dist/leader-thread/eventlog.js

@@ -0,0 +1,119 @@
+import { LS_DEV, shouldNeverHappen } from '@livestore/utils';
+import { Effect, Option, Schema } from '@livestore/utils/effect';
+import * as EventSequenceNumber from '../schema/EventSequenceNumber.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
+import { EVENTLOG_META_TABLE, eventlogMetaTable, eventlogSystemTables, sessionChangesetMetaTable, SYNC_STATUS_TABLE, } from '../schema/state/sqlite/system-tables.js';
+import { migrateTable } from '../schema-management/migrations.js';
+import { insertRow, updateRows } from '../sql-queries/sql-queries.js';
+import { prepareBindValues, sql } from '../util.js';
+import { execSql } from './connection.js';
+import { LeaderThreadCtx } from './types.js';
+export const initEventlogDb = (dbEventlog) => Effect.gen(function* () {
+    for (const tableDef of eventlogSystemTables) {
+        yield* migrateTable({
+            db: dbEventlog,
+            behaviour: 'create-if-not-exists',
+            tableAst: tableDef.sqliteDef.ast,
+            skipMetaTable: true,
+        });
+    }
+    // Create sync status row if it doesn't exist
+    yield* execSql(dbEventlog, sql `INSERT INTO ${SYNC_STATUS_TABLE} (head)
+          SELECT ${EventSequenceNumber.ROOT.global}
+          WHERE NOT EXISTS (SELECT 1 FROM ${SYNC_STATUS_TABLE})`, {});
+});
+/** Exclusive of the "since event" */
+export const getEventsSince = (since) => Effect.gen(function* () {
+    const { dbEventlog, dbState } = yield* LeaderThreadCtx;
+    const query = eventlogMetaTable.where('seqNumGlobal', '>=', since.global).asSql();
+    const pendingEventsRaw = dbEventlog.select(query.query, prepareBindValues(query.bindValues, query.query));
+    const pendingEvents = Schema.decodeUnknownSync(eventlogMetaTable.rowSchema.pipe(Schema.Array))(pendingEventsRaw);
+    const sessionChangesetRows = sessionChangesetMetaTable.where('seqNumGlobal', '>=', since.global).asSql();
+    const sessionChangesetRowsRaw = dbState.select(sessionChangesetRows.query, prepareBindValues(sessionChangesetRows.bindValues, sessionChangesetRows.query));
+    const sessionChangesetRowsDecoded = Schema.decodeUnknownSync(sessionChangesetMetaTable.rowSchema.pipe(Schema.Array))(sessionChangesetRowsRaw);
+    return pendingEvents
+        .map((eventlogEvent) => {
+        const sessionChangeset = sessionChangesetRowsDecoded.find((readModelEvent) => readModelEvent.seqNumGlobal === eventlogEvent.seqNumGlobal &&
+            readModelEvent.seqNumClient === eventlogEvent.seqNumClient);
+        return LiveStoreEvent.EncodedWithMeta.make({
+            name: eventlogEvent.name,
+            args: eventlogEvent.argsJson,
+            seqNum: { global: eventlogEvent.seqNumGlobal, client: eventlogEvent.seqNumClient },
+            parentSeqNum: { global: eventlogEvent.parentSeqNumGlobal, client: eventlogEvent.parentSeqNumClient },
+            clientId: eventlogEvent.clientId,
+            sessionId: eventlogEvent.sessionId,
+            meta: {
+                sessionChangeset: sessionChangeset && sessionChangeset.changeset !== null
+                    ? {
+                        _tag: 'sessionChangeset',
+                        data: sessionChangeset.changeset,
+                        debug: sessionChangeset.debug,
+                    }
+                    : { _tag: 'unset' },
+                syncMetadata: eventlogEvent.syncMetadataJson,
+            },
+        });
+    })
+        .filter((_) => EventSequenceNumber.compare(_.seqNum, since) > 0)
+        .sort((a, b) => EventSequenceNumber.compare(a.seqNum, b.seqNum));
+});
+export const getClientHeadFromDb = (dbEventlog) => {
+    const res = dbEventlog.select(sql `select seqNumGlobal, seqNumClient from ${EVENTLOG_META_TABLE} order by seqNumGlobal DESC, seqNumClient DESC limit 1`)[0];
+    return res ? { global: res.seqNumGlobal, client: res.seqNumClient } : EventSequenceNumber.ROOT;
+};
+export const getBackendHeadFromDb = (dbEventlog) => dbEventlog.select(sql `select head from ${SYNC_STATUS_TABLE}`)[0]?.head ?? EventSequenceNumber.ROOT.global;
+// TODO use prepared statements
+export const updateBackendHead = (dbEventlog, head) => dbEventlog.execute(sql `UPDATE ${SYNC_STATUS_TABLE} SET head = ${head.global}`);
+export const insertIntoEventlog = (eventEncoded, dbEventlog, eventDefSchemaHash, clientId, sessionId) => Effect.gen(function* () {
+    // Check history consistency during LS_DEV
+    if (LS_DEV && eventEncoded.parentSeqNum.global !== EventSequenceNumber.ROOT.global) {
+        const parentEventExists = dbEventlog.select(`SELECT COUNT(*) as count FROM ${EVENTLOG_META_TABLE} WHERE seqNumGlobal = ? AND seqNumClient = ?`, [eventEncoded.parentSeqNum.global, eventEncoded.parentSeqNum.client])[0].count === 1;
+        if (parentEventExists === false) {
+            shouldNeverHappen(`Parent mutation ${eventEncoded.parentSeqNum.global},${eventEncoded.parentSeqNum.client} does not exist`);
+        }
+    }
+    // TODO use prepared statements
+    yield* execSql(dbEventlog, ...insertRow({
+        tableName: EVENTLOG_META_TABLE,
+        columns: eventlogMetaTable.sqliteDef.columns,
+        values: {
+            seqNumGlobal: eventEncoded.seqNum.global,
+            seqNumClient: eventEncoded.seqNum.client,
+            parentSeqNumGlobal: eventEncoded.parentSeqNum.global,
+            parentSeqNumClient: eventEncoded.parentSeqNum.client,
+            name: eventEncoded.name,
+            argsJson: eventEncoded.args ?? {},
+            clientId,
+            sessionId,
+            schemaHash: eventDefSchemaHash,
+            syncMetadataJson: eventEncoded.meta.syncMetadata,
+        },
+    }));
+});
+export const updateSyncMetadata = (items) => Effect.gen(function* () {
+    const { dbEventlog } = yield* LeaderThreadCtx;
+    // TODO try to do this in a single query
+    for (let i = 0; i < items.length; i++) {
+        const event = items[i];
+        yield* execSql(dbEventlog, ...updateRows({
+            tableName: EVENTLOG_META_TABLE,
+            columns: eventlogMetaTable.sqliteDef.columns,
+            where: { seqNumGlobal: event.seqNum.global, seqNumClient: event.seqNum.client },
+            updateValues: { syncMetadataJson: event.meta.syncMetadata },
+        }));
+    }
+});
+export const getSyncBackendCursorInfo = (remoteHead) => Effect.gen(function* () {
+    const { dbEventlog } = yield* LeaderThreadCtx;
+    if (remoteHead === EventSequenceNumber.ROOT.global)
+        return Option.none();
+    const EventlogQuerySchema = Schema.Struct({
+        syncMetadataJson: Schema.parseJson(Schema.Option(Schema.JsonValue)),
+    }).pipe(Schema.pluck('syncMetadataJson'), Schema.Array, Schema.head);
+    const syncMetadataOption = yield* Effect.sync(() => dbEventlog.select(sql `SELECT syncMetadataJson FROM ${EVENTLOG_META_TABLE} WHERE seqNumGlobal = ${remoteHead} ORDER BY seqNumClient ASC LIMIT 1`)).pipe(Effect.andThen(Schema.decode(EventlogQuerySchema)), Effect.map(Option.flatten), Effect.orDie);
+    return Option.some({
+        cursor: { global: remoteHead, client: EventSequenceNumber.clientDefault },
+        metadata: syncMetadataOption,
+    });
+}).pipe(Effect.withSpan('@livestore/common:eventlog:getSyncBackendCursorInfo', { attributes: { remoteHead } }));
+//# sourceMappingURL=eventlog.js.map

package/dist/leader-thread/eventlog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eventlog.js","sourceRoot":"","sources":["../../src/leader-thread/eventlog.ts"],"names":[],"mappings":"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"}

package/dist/leader-thread/leader-worker-devtools.d.ts

@@ -2,5 +2,5 @@ import { Effect } from '@livestore/utils/effect';
 import { UnexpectedError } from '../index.js';
 import type { DevtoolsOptions } from './types.js';
 import { LeaderThreadCtx } from './types.js';
-export declare const bootDevtools: (options: DevtoolsOptions) => Effect.Effect<void, UnexpectedError, import("effect/Scope").Scope | import("@effect/platform/HttpClient").HttpClient | LeaderThreadCtx>;
+export declare const bootDevtools: (options: DevtoolsOptions) => Effect.Effect<void, UnexpectedError, import("effect/Scope").Scope | LeaderThreadCtx | import("@effect/platform/HttpClient").HttpClient>;
 //# sourceMappingURL=leader-worker-devtools.d.ts.map

package/dist/leader-thread/leader-worker-devtools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leader-worker-devtools.d.ts","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA6C,MAAM,yBAAyB,CAAA;AAE3F,OAAO,EAAwD,eAAe,EAAE,MAAM,aAAa,CAAA;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAuB,MAAM,YAAY,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,eAAO,MAAM,YAAY,YAAa,eAAe,4IAmDsB,CAAA"}
+{"version":3,"file":"leader-worker-devtools.d.ts","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA6C,MAAM,yBAAyB,CAAA;AAG3F,OAAO,EAAwD,eAAe,EAAE,MAAM,aAAa,CAAA;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAuB,MAAM,YAAY,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,eAAO,MAAM,YAAY,GAAI,SAAS,eAAe,4IAwDsB,CAAA"}

package/dist/leader-thread/leader-worker-devtools.js

@@ -1,102 +1,132 @@
 import { Effect, FiberMap, Option, Stream, SubscriptionRef } from '@livestore/utils/effect';
+import { nanoid } from '@livestore/utils/nanoid';
 import { Devtools, IntentionalShutdownCause, liveStoreVersion, UnexpectedError } from '../index.js';
-import { MUTATION_LOG_META_TABLE, SCHEMA_META_TABLE, SCHEMA_MUTATIONS_META_TABLE } from '../schema/mod.js';
+import { SystemTables } from '../schema/mod.js';
 import { LeaderThreadCtx } from './types.js';
 // TODO bind scope to the webchannel lifetime
 export const bootDevtools = (options) => Effect.gen(function* () {
     if (options.enabled === false) {
         return;
     }
-    const { connectedClientSessionPullQueues, syncProcessor, extraIncomingMessagesQueue } = yield* LeaderThreadCtx;
+    const { syncProcessor, extraIncomingMessagesQueue, clientId, storeId } = yield* LeaderThreadCtx;
     yield* listenToDevtools({
         incomingMessages: Stream.fromQueue(extraIncomingMessagesQueue),
         sendMessage: () => Effect.void,
     }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
-    const { persistenceInfo, devtoolsWebChannel } = yield* options.makeContext;
-    const sendMessage = (message) => devtoolsWebChannel
-        .send(message)
-        .pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:sendToDevtools'), Effect.interruptible, Effect.ignoreLogged);
-    const { localHead } = yield* syncProcessor.syncState;
-    // TODO close queue when devtools disconnects
-    const pullQueue = yield* connectedClientSessionPullQueues.makeQueue(localHead);
-    yield* Stream.fromQueue(pullQueue).pipe(Stream.tap((msg) => Effect.gen(function* () {
-        if (msg.payload._tag === 'upstream-advance') {
-            for (const mutationEventEncoded of msg.payload.newEvents) {
-                // TODO refactor with push semantics
-                yield* sendMessage(Devtools.MutationBroadcast.make({ mutationEventEncoded, liveStoreVersion }));
-            }
-        }
-        else {
-            yield* Effect.logWarning('TODO implement rebases in devtools');
-        }
-    })), Stream.runDrain, Effect.forkScoped);
-    yield* listenToDevtools({
-        incomingMessages: devtoolsWebChannel.listen.pipe(Stream.flatten(), Stream.orDie),
-        sendMessage,
-        persistenceInfo,
-    }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
+    const { node, persistenceInfo, mode } = yield* options.boot;
+    yield* node.listenForChannel.pipe(Stream.filter((res) => Devtools.isChannelName.devtoolsClientLeader(res.channelName, { storeId, clientId }) && res.mode === mode), Stream.tap(({ channelName, source }) => Effect.gen(function* () {
+        const channel = yield* node.makeChannel({
+            target: source,
+            channelName,
+            schema: { listen: Devtools.Leader.MessageToApp, send: Devtools.Leader.MessageFromApp },
+            mode,
+        });
+        const sendMessage = (message) => channel
+            .send(message)
+            .pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:sendToDevtools'), Effect.interruptible, Effect.ignoreLogged);
+        const syncState = yield* syncProcessor.syncState;
+        const mergeCounter = syncProcessor.getMergeCounter();
+        yield* syncProcessor.pull({ cursor: { mergeCounter, eventNum: syncState.localHead } }).pipe(Stream.tap(({ payload }) => sendMessage(Devtools.Leader.SyncPull.make({ payload, liveStoreVersion }))), Stream.runDrain, Effect.forkScoped);
+        yield* listenToDevtools({
+            incomingMessages: channel.listen.pipe(Stream.flatten(), Stream.orDie),
+            sendMessage,
+            persistenceInfo,
+        });
+    }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)), Stream.runDrain);
 }).pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:boot'));
 const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) => Effect.gen(function* () {
-    const { syncBackend, makeSyncDb, db, dbLog, shutdownStateSubRef, shutdownChannel, syncProcessor } = yield* LeaderThreadCtx;
+    const { syncBackend, makeSqliteDb, dbState, dbEventlog, shutdownStateSubRef, shutdownChannel, syncProcessor, clientId, devtools, } = yield* LeaderThreadCtx;
     const subscriptionFiberMap = yield* FiberMap.make();
+    const handledRequestIds = new Set();
     yield* incomingMessages.pipe(Stream.tap((decodedEvent) => Effect.gen(function* () {
-        // yield* Effect.logDebug('[@livestore/common:leader-thread:devtools] incomingMessage', decodedEvent)
-        if (decodedEvent._tag === 'LSD.Disconnect') {
+        const { requestId } = decodedEvent;
+        const reqPayload = { requestId, liveStoreVersion, clientId };
+        // yield* Effect.logDebug(
+        //   `[@livestore/common:leader-thread:devtools] incomingMessage: ${decodedEvent._tag} (${requestId})`,
+        //   decodedEvent,
+        // )
+        if (decodedEvent._tag === 'LSD.Leader.Disconnect') {
             return;
         }
-        const { requestId } = decodedEvent;
-        const reqPayload = { requestId, liveStoreVersion };
+        // TODO we should try to move the duplicate message handling on the webmesh layer
+        // So far I could only observe this problem with webmesh proxy channels (e.g. for Expo)
+        // Proof: https://share.cleanshot.com/V9G87B0B
+        // Also see `store/devtools.ts` for same problem
+        if (handledRequestIds.has(requestId)) {
+            // yield* Effect.logWarning(`Duplicate message`, decodedEvent)
+            return;
+        }
+        handledRequestIds.add(requestId);
         switch (decodedEvent._tag) {
-            case 'LSD.Ping': {
-                yield* sendMessage(Devtools.Pong.make({ ...reqPayload }));
+            case 'LSD.Leader.Ping': {
+                yield* sendMessage(Devtools.Leader.Pong.make({ ...reqPayload }));
                 return;
             }
             case 'LSD.Leader.SnapshotReq': {
-                const snapshot = db.export();
-                yield* sendMessage(Devtools.SnapshotRes.make({ snapshot, ...reqPayload }));
+                const snapshot = dbState.export();
+                yield* sendMessage(Devtools.Leader.SnapshotRes.make({ snapshot, ...reqPayload }));
                 return;
             }
-            case 'LSD.Leader.LoadDatabaseFileReq': {
+            case 'LSD.Leader.LoadDatabaseFile.Request': {
                 const { data } = decodedEvent;
                 let tableNames;
                 try {
-                    const tmpSyncDb = yield* makeSyncDb({ _tag: 'in-memory' });
-                    tmpSyncDb.import(data);
-                    const tableNameResults = tmpSyncDb.select(`select name from sqlite_master where type = 'table'`);
+                    const tmpDb = yield* makeSqliteDb({ _tag: 'in-memory' });
+                    tmpDb.import(data);
+                    const tableNameResults = tmpDb.select(`select name from sqlite_master where type = 'table'`);
                     tableNames = new Set(tableNameResults.map((_) => _.name));
-                    tmpSyncDb.close();
+                    tmpDb.close();
                 }
-                catch (e) {
-                    yield* Effect.logError(`Error importing database file`, e);
-                    yield* sendMessage(Devtools.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-file' }));
+                catch (cause) {
+                    yield* Effect.logError(`Error importing database file`, cause);
+                    yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Error.make({
+                        ...reqPayload,
+                        cause: { _tag: 'unexpected-error', cause },
+                    }));
                     return;
                 }
-                if (tableNames.has(MUTATION_LOG_META_TABLE)) {
-                    yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
-                    dbLog.import(data);
-                    db.destroy();
-                }
-                else if (tableNames.has(SCHEMA_META_TABLE) && tableNames.has(SCHEMA_MUTATIONS_META_TABLE)) {
-                    yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
-                    db.import(data);
-                    dbLog.destroy();
+                try {
+                    if (tableNames.has(SystemTables.EVENTLOG_META_TABLE)) {
+                        // Is eventlog db
+                        yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
+                        dbEventlog.import(data);
+                        dbState.destroy();
+                    }
+                    else if (tableNames.has(SystemTables.SCHEMA_META_TABLE) &&
+                        tableNames.has(SystemTables.SCHEMA_EVENT_DEFS_META_TABLE)) {
+                        // Is state db
+                        yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
+                        dbState.import(data);
+                        dbEventlog.destroy();
+                    }
+                    else {
+                        yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Error.make({
+                            ...reqPayload,
+                            cause: { _tag: 'unsupported-database' },
+                        }));
+                        return;
+                    }
+                    yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Success.make({ ...reqPayload }));
+                    yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-import' })) ?? Effect.void;
+                    return;
                 }
-                else {
-                    yield* sendMessage(Devtools.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-database' }));
+                catch (cause) {
+                    yield* Effect.logError(`Error importing database file`, cause);
+                    yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Error.make({
+                        ...reqPayload,
+                        cause: { _tag: 'unexpected-error', cause },
+                    }));
                     return;
                 }
-                yield* sendMessage(Devtools.LoadDatabaseFileRes.make({ ...reqPayload, status: 'ok' }));
-                yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-import' })) ?? Effect.void;
-                return;
             }
-            case 'LSD.Leader.ResetAllDataReq': {
+            case 'LSD.Leader.ResetAllData.Request': {
                 const { mode } = decodedEvent;
                 yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
-                db.destroy();
+                dbState.destroy();
                 if (mode === 'all-data') {
-                    dbLog.destroy();
+                    dbEventlog.destroy();
                 }
-                yield* sendMessage(Devtools.ResetAllDataRes.make({ ...reqPayload }));
+                yield* sendMessage(Devtools.Leader.ResetAllData.Success.make({ ...reqPayload }));
                 yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-reset' })) ?? Effect.void;
                 return;
             }
@@ -106,30 +136,40 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                     return;
                 }
                 const dbSizeQuery = `SELECT page_count * page_size as size FROM pragma_page_count(), pragma_page_size();`;
-                const dbFileSize = db.select(dbSizeQuery, undefined)[0].size;
-                const mutationLogFileSize = dbLog.select(dbSizeQuery, undefined)[0].size;
-                yield* sendMessage(Devtools.DatabaseFileInfoRes.make({
-                    db: { fileSize: dbFileSize, persistenceInfo: persistenceInfo.db },
-                    mutationLog: { fileSize: mutationLogFileSize, persistenceInfo: persistenceInfo.mutationLog },
+                const dbFileSize = dbState.select(dbSizeQuery, undefined)[0].size;
+                const eventlogFileSize = dbEventlog.select(dbSizeQuery, undefined)[0].size;
+                yield* sendMessage(Devtools.Leader.DatabaseFileInfoRes.make({
+                    state: { fileSize: dbFileSize, persistenceInfo: persistenceInfo.state },
+                    eventlog: { fileSize: eventlogFileSize, persistenceInfo: persistenceInfo.eventlog },
                     ...reqPayload,
                 }));
                 return;
             }
-            case 'LSD.Leader.MutationLogReq': {
-                const mutationLog = dbLog.export();
-                yield* sendMessage(Devtools.MutationLogRes.make({ mutationLog, ...reqPayload }));
+            case 'LSD.Leader.EventlogReq': {
+                const eventlog = dbEventlog.export();
+                yield* sendMessage(Devtools.Leader.EventlogRes.make({ eventlog, ...reqPayload }));
                 return;
             }
-            case 'LSD.Leader.RunMutationReq': {
-                yield* syncProcessor.pushPartial(decodedEvent.mutationEventEncoded);
-                yield* sendMessage(Devtools.RunMutationRes.make({ ...reqPayload }));
+            case 'LSD.Leader.CommitEventReq': {
+                yield* syncProcessor.pushPartial({
+                    event: decodedEvent.eventEncoded,
+                    clientId: `devtools-${clientId}`,
+                    sessionId: `devtools-${clientId}`,
+                });
+                yield* sendMessage(Devtools.Leader.CommitEventRes.make({ ...reqPayload }));
                 return;
             }
             case 'LSD.Leader.SyncHistorySubscribe': {
-                const { requestId } = decodedEvent;
+                const { subscriptionId } = decodedEvent;
                 if (syncBackend !== undefined) {
                     // TODO consider piggybacking on the existing leader-thread sync-pulling
-                    yield* syncBackend.pull(Option.none()).pipe(Stream.map((_) => _.batch), Stream.flattenIterables, Stream.tap(({ mutationEventEncoded, metadata }) => sendMessage(Devtools.SyncHistoryRes.make({ mutationEventEncoded, metadata, ...reqPayload }))), Stream.runDrain, Effect.acquireRelease(() => Effect.log('syncHistorySubscribe done')), Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
+                    yield* syncBackend.pull(Option.none()).pipe(Stream.map((_) => _.batch), Stream.flattenIterables, Stream.tap(({ eventEncoded, metadata }) => sendMessage(Devtools.Leader.SyncHistoryRes.make({
+                        eventEncoded,
+                        metadata,
+                        subscriptionId,
+                        ...reqPayload,
+                        requestId: nanoid(10),
+                    }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, subscriptionId));
                 }
                 return;
             }
@@ -140,24 +180,26 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                 return;
             }
             case 'LSD.Leader.SyncingInfoReq': {
-                const syncingInfo = Devtools.SyncingInfo.make({
+                const syncingInfo = Devtools.Leader.SyncingInfo.make({
                     enabled: syncBackend !== undefined,
-                    metadata: {},
+                    metadata: syncBackend?.metadata ?? {},
                 });
-                yield* sendMessage(Devtools.SyncingInfoRes.make({ syncingInfo, ...reqPayload }));
+                yield* sendMessage(Devtools.Leader.SyncingInfoRes.make({ syncingInfo, ...reqPayload }));
                 return;
             }
             case 'LSD.Leader.NetworkStatusSubscribe': {
                 if (syncBackend !== undefined) {
-                    const { requestId } = decodedEvent;
+                    const { subscriptionId } = decodedEvent;
                     // TODO investigate and fix bug. seems that when sending messages right after
                     // the devtools have connected get sometimes lost
                     // This is probably the same "flaky databrowser loading" bug as we're seeing in the playwright tests
                     yield* Effect.sleep(1000);
-                    yield* syncBackend.isConnected.changes.pipe(Stream.tap((isConnected) => sendMessage(Devtools.NetworkStatusRes.make({
-                        networkStatus: { isConnected, timestampMs: Date.now() },
+                    yield* Stream.zipLatest(syncBackend.isConnected.changes, devtools.enabled ? devtools.syncBackendLatchState.changes : Stream.make({ latchClosed: false })).pipe(Stream.tap(([isConnected, { latchClosed }]) => sendMessage(Devtools.Leader.NetworkStatusRes.make({
+                        networkStatus: { isConnected, timestampMs: Date.now(), latchClosed },
+                        subscriptionId,
                         ...reqPayload,
-                    }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
+                        requestId: nanoid(10),
+                    }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, subscriptionId));
                 }
                 return;
             }
@@ -166,6 +208,39 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                 yield* FiberMap.remove(subscriptionFiberMap, requestId);
                 return;
             }
+            case 'LSD.Leader.SyncHeadSubscribe': {
+                const { subscriptionId } = decodedEvent;
+                yield* syncProcessor.syncState.changes.pipe(Stream.tap((syncState) => sendMessage(Devtools.Leader.SyncHeadRes.make({
+                    local: syncState.localHead,
+                    upstream: syncState.upstreamHead,
+                    subscriptionId,
+                    ...reqPayload,
+                    requestId: nanoid(10),
+                }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, subscriptionId));
+                return;
+            }
+            case 'LSD.Leader.SyncHeadUnsubscribe': {
+                const { subscriptionId } = decodedEvent;
+                yield* FiberMap.remove(subscriptionFiberMap, subscriptionId);
+                return;
+            }
+            case 'LSD.Leader.SetSyncLatch.Request': {
+                const { closeLatch } = decodedEvent;
+                if (devtools.enabled === false)
+                    return;
+                if (closeLatch === true) {
+                    yield* devtools.syncBackendLatch.close;
+                }
+                else {
+                    yield* devtools.syncBackendLatch.open;
+                }
+                yield* SubscriptionRef.set(devtools.syncBackendLatchState, { latchClosed: closeLatch });
+                yield* sendMessage(Devtools.Leader.SetSyncLatch.Success.make({ ...reqPayload }));
+                return;
+            }
+            default: {
+                yield* Effect.logWarning(`TODO implement devtools message`, decodedEvent);
+            }
         }
     }).pipe(Effect.withSpan(`@livestore/common:leader-thread:onDevtoolsMessage:${decodedEvent._tag}`))), UnexpectedError.mapToUnexpectedErrorStream, Stream.runDrain);
 });