@livestore/common 0.0.58-dev.0 → 0.0.58-dev.10

package/dist/sync/next/test/mutation-fixtures.js

@@ -0,0 +1,161 @@
+import { Schema } from '@livestore/utils/effect';
+import { ROOT_ID } from '../../../adapter-types.js';
+import { defineFacts, defineMutation } from '../../../schema/mutations.js';
+import { factsSnapshotForDag, getFactsGroupForMutationArgs } from '../facts.js';
+import { historyDagFromNodes, rootEventNode } from '../history-dag.js';
+/** Used for conflict detection and event history compaction */
+export const facts = defineFacts({
+    todoExists: (id) => `todo-exists-${id}`,
+    todoIsWriteable: (id, writeable) => [`todo-is-writeable-${id}`, writeable],
+    todoCompleted: (id, completed) => [`todo-completed-${id}`, completed],
+    todoTextUpdated: (id) => `todo-text-updated-${id}`,
+    inputValue: (id) => `input-value-${id}`,
+});
+export const mutations = {
+    createTodo: defineMutation('createTodo', Schema.Struct({ id: Schema.String, text: Schema.String }), 'INSERT INTO todos (id, text) VALUES ($id, $text)', {
+        facts: ({ id }) => ({
+            modify: {
+                set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoCompleted(id, false)],
+            },
+        }),
+    }),
+    upsertTodo: defineMutation('upsertTodo', Schema.Struct({ id: Schema.String, text: Schema.optional(Schema.String) }), 'INSERT INTO todos (id, text) VALUES ($id, $text) ON CONFLICT (id) DO UPDATE SET text = $text', {
+        facts: ({ id }, currentFacts) => 
+        // TODO enable an API along the lines of `map.has(key, value)`
+        currentFacts.has(facts.todoExists(id)) && currentFacts.get(facts.todoIsWriteable(id, true)[0]) === false
+            ? { require: [facts.todoExists(id), facts.todoIsWriteable(id, true)] }
+            : { modify: { set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoTextUpdated(id)] } },
+    }),
+    completeTodo: defineMutation('completeTodo', Schema.Struct({ id: Schema.String }), 
+    // consider `RETURNING` to validate before applying facts
+    'UPDATE todos SET completed = true WHERE id = $id', {
+        // prewrite assertions from DB
+        // enables more concurrency
+        // turning database inside out
+        // similar to upsert semantics
+        facts: ({ id }) => ({
+            require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+            modify: { set: [facts.todoCompleted(id, true)] },
+        }),
+    }),
+    uncompleteTodo: defineMutation('uncompleteTodo', Schema.Struct({ id: Schema.String }), 'UPDATE todos SET completed = false WHERE id = $id', {
+        facts: ({ id }) => ({
+            require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+            modify: { set: [facts.todoCompleted(id, false)] },
+        }),
+    }),
+    completeTodos: defineMutation('completeTodos', Schema.Struct({ ids: Schema.Array(Schema.String) }), 'UPDATE todos SET completed = true WHERE id IN ($ids:csv)', {
+        facts: ({ ids }) => ({
+            require: ids.flatMap((id) => [facts.todoExists(id), facts.todoIsWriteable(id, true)]),
+            modify: { set: ids.map((id) => facts.todoCompleted(id, true)) },
+        }),
+    }),
+    toggleTodo: defineMutation('toggleTodo', Schema.Struct({ id: Schema.String }), 'UPDATE todos SET completed = NOT completed WHERE id = $id', {
+        facts: ({ id }, currentFacts) => {
+            const currentIsCompleted = currentFacts.get(facts.todoCompleted(id, true)[0]) === true;
+            return {
+                require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+                modify: {
+                    // remove: [facts.todoCompleted(id, currentIsCompleted)],
+                    set: [facts.todoCompleted(id, !currentIsCompleted)],
+                },
+            };
+        },
+    }),
+    setReadonlyTodo: defineMutation('setReadonlyTodo', Schema.Struct({ id: Schema.String, readonly: Schema.Boolean }), 'UPDATE todos SET readonly = $readonly WHERE id = $id', {
+        facts: ({ id, readonly }) => ({
+            require: [facts.todoExists(id)],
+            modify: { set: [facts.todoIsWriteable(id, !readonly)] },
+        }),
+    }),
+    setTextTodo: defineMutation('setTextTodo', Schema.Struct({ id: Schema.String, text: Schema.String }), 'UPDATE todos SET text = $text WHERE id = $id', {
+        facts: ({ id }) => ({
+            require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
+            modify: { set: [facts.todoTextUpdated(id)] },
+        }),
+    }),
+    setInputValue: defineMutation('setInputValue', Schema.Struct({ id: Schema.String, text: Schema.String }), 'UPDATE todos SET text = $text WHERE id = $id', {
+        localOnly: true,
+        facts: ({ id }) => ({ modify: { set: [facts.inputValue(id)] } }),
+    }),
+};
+export const toEventNodes = (partialEvents, mutationDefs) => {
+    const nodesAcc = [rootEventNode];
+    let currentEventId = ROOT_ID;
+    const getNextEventId = (mutationDef) => {
+        if (mutationDef.options.localOnly) {
+            return { global: currentEventId.global, local: currentEventId.local + 1 };
+        }
+        return { global: currentEventId.global + 1, local: 0 };
+    };
+    const eventNodes = partialEvents.map((partialEvent) => {
+        const mutationDef = mutationDefs[partialEvent.mutation];
+        const eventId = getNextEventId(mutationDef);
+        currentEventId = eventId;
+        const factsSnapshot = factsSnapshotForDag(historyDagFromNodes(nodesAcc, { skipFactsCheck: true }), undefined);
+        // console.log('factsSnapshot', eventId, factsSnapshot)
+        // const depRead: MutationEventFactsSnapshot = new Map<string, any>()
+        // const factsSnapshotProxy = new Proxy(factsSnapshot, {
+        //   get: (target, prop) => {
+        //     if (prop === 'has') {
+        //       return (key: string) => {
+        //         depRead.set(key, EMPTY_FACT_VALUE)
+        //         return target.has(key)
+        //       }
+        //     } else if (prop === 'get') {
+        //       return (key: string) => {
+        //         depRead.set(key, EMPTY_FACT_VALUE)
+        //         return target.get(key)
+        //       }
+        //     }
+        //     notYetImplemented(`toEventNodes: ${prop.toString()} is not yet implemented`)
+        //   },
+        // })
+        // const factsRes = mutationDef.options.facts?.(partialEvent.args, factsSnapshotProxy)
+        // console.log('factsRes', factsRes?.modify, factsRes?.require)
+        // const iterableToMap = (iterable: Iterable<MutationEventFactInput>) => {
+        //   const map = new Map()
+        //   for (const item of iterable) {
+        //     if (typeof item === 'string') {
+        //       map.set(item, EMPTY_FACT_VALUE)
+        //     } else {
+        //       map.set(item[0], item[1])
+        //     }
+        //   }
+        //   return map
+        // }
+        // const facts = {
+        //   modifyAdd: factsRes?.modify.add ? iterableToMap(factsRes.modify.add) : new Map(),
+        //   modifyRemove: factsRes?.modify.remove ? iterableToMap(factsRes.modify.remove) : new Map(),
+        //   depRequire: factsRes?.require ? iterableToMap(factsRes.require) : new Map(),
+        //   depRead,
+        // } satisfies MutationEventFactsGroup
+        // applyFactGroup(facts, factsSnapshot)
+        const facts = getFactsGroupForMutationArgs({
+            factsCallback: mutationDef.options.facts,
+            args: partialEvent.args,
+            currentFacts: factsSnapshot,
+        });
+        const node = {
+            id: eventId,
+            parentId: getParentId(eventId),
+            mutation: partialEvent.mutation,
+            args: partialEvent.args,
+            factsGroup: facts,
+        };
+        nodesAcc.push(node);
+        return node;
+    });
+    eventNodes.unshift(rootEventNode);
+    // console.log('eventNodes', eventNodes)
+    return eventNodes;
+};
+const getParentId = (eventId) => {
+    const globalParentId = eventId.global;
+    const localParentId = eventId.local - 1;
+    if (localParentId < 0) {
+        return { global: globalParentId - 1, local: 0 };
+    }
+    return { global: globalParentId, local: localParentId };
+};
+//# sourceMappingURL=mutation-fixtures.js.map

package/dist/sync/next/test/mutation-fixtures.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mutation-fixtures.js","sourceRoot":"","sources":["../../../../src/sync/next/test/mutation-fixtures.ts"],"names":[],"mappings":"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"}

package/dist/sync/sync.d.ts

@@ -1,12 +1,25 @@
-import { type Effect, Schema, type Stream, type SubscriptionRef } from '@livestore/utils/effect';
+import type { Effect, HttpClient, Option, Stream, SubscriptionRef } from '@livestore/utils/effect';
+import { Schema } from '@livestore/utils/effect';
+import type { EventId } from '../adapter-types.js';
 import type { MutationEvent } from '../schema/mutations.js';
-export type SyncImpl = {
-    pull: (cursor: string | undefined) => Stream.Stream<MutationEvent.AnyEncoded, IsOfflineError | InvalidPullError>;
-    pushes: Stream.Stream<{
+export interface SyncBackendOptionsBase {
+    type: string;
+    [key: string]: Schema.JsonValue;
+}
+export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
+    pull: (args: Option.Option<{
+        cursor: EventId;
+        metadata: Option.Option<TSyncMetadata>;
+    }>, options: {
+        listenForNew: boolean;
+    }) => Stream.Stream<{
         mutationEventEncoded: MutationEvent.AnyEncoded;
+        metadata: Option.Option<TSyncMetadata>;
         persisted: boolean;
-    }>;
-    push: (mutationEventEncoded: MutationEvent.AnyEncoded, persisted: boolean) => Effect.Effect<void, IsOfflineError | InvalidPushError>;
+    }, IsOfflineError | InvalidPullError, HttpClient.HttpClient>;
+    push: (mutationEventEncoded: MutationEvent.AnyEncoded, persisted: boolean) => Effect.Effect<{
+        metadata: Option.Option<TSyncMetadata>;
+    }, IsOfflineError | InvalidPushError, HttpClient.HttpClient>;
     isConnected: SubscriptionRef.SubscriptionRef<boolean>;
 };
 declare const IsOfflineError_base: Schema.TaggedErrorClass<IsOfflineError, "IsOfflineError", {

package/dist/sync/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEhG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE3D,MAAM,MAAM,QAAQ,GAAG;IAErB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAA;IAChH,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QAAE,oBAAoB,EAAE,aAAa,CAAC,UAAU,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IAC7F,IAAI,EAAE,CACJ,oBAAoB,EAAE,aAAa,CAAC,UAAU,EAC9C,SAAS,EAAE,OAAO,KACf,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAA;IAC3D,WAAW,EAAE,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;CACtD,CAAA;;;;AAED,qBAAa,cAAe,SAAQ,mBAA0D;CAAG;;;;;;AACjG,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;;;;;AACL,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAClG,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE3D,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAA;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,SAAS,CAAA;CAChC;AAED,MAAM,MAAM,WAAW,CAAC,aAAa,GAAG,MAAM,CAAC,SAAS,IAAI;IAC1D,IAAI,EAAE,CACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAClB,MAAM,EAAE,OAAO,CAAA;QACf,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;KACvC,CAAC,EACF,OAAO,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,KAC/B,MAAM,CAAC,MAAM,CAChB;QACE,oBAAoB,EAAE,aAAa,CAAC,UAAU,CAAA;QAC9C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QACtC,SAAS,EAAE,OAAO,CAAA;KACnB,EACD,cAAc,GAAG,gBAAgB,EACjC,UAAU,CAAC,UAAU,CACtB,CAAA;IAED,IAAI,EAAE,CACJ,oBAAoB,EAAE,aAAa,CAAC,UAAU,EAC9C,SAAS,EAAE,OAAO,KACf,MAAM,CAAC,MAAM,CAChB;QAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;KAAE,EAC1C,cAAc,GAAG,gBAAgB,EACjC,UAAU,CAAC,UAAU,CACtB,CAAA;IACD,WAAW,EAAE,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;CACtD,CAAA;;;;AAED,qBAAa,cAAe,SAAQ,mBAA0D;CAAG;;;;;;AACjG,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;;;;;AACL,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG"}

package/dist/sync/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAqC,MAAM,yBAAyB,CAAA;AAehG,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,WAAW,EAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC;CAAG;AACjG,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC;CAAG;AACL,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC;CAAG"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAsChD,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,WAAW,EAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC;CAAG;AACjG,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC;CAAG;AACL,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC;CAAG"}

package/dist/version.d.ts

@@ -1,2 +1,10 @@
 export declare const liveStoreVersion: string;
+/**
+ * This version number is incremented whenever the internal storage format changes in a breaking way.
+ * Whenever this version changes, LiveStore will start with fresh database files. Old database files are not deleted.
+ *
+ * While LiveStore is in alpha, this might happen more frequently.
+ * In the future, LiveStore will provide a migration path for older database files to avoid the impression of data loss.
+ */
+export declare const liveStoreStorageFormatVersion = 2;
 //# sourceMappingURL=version.d.ts.map

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,QAAsB,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,QAAsB,CAAA;AAEnD;;;;;;GAMG;AACH,eAAO,MAAM,6BAA6B,IAAI,CAAA"}

package/dist/version.js

@@ -1,3 +1,12 @@
 import packageJson from '../package.json' with { type: 'json' };
+// import packageJson from '../package.json' assert { type: 'json' }
 export const liveStoreVersion = packageJson.version;
+/**
+ * This version number is incremented whenever the internal storage format changes in a breaking way.
+ * Whenever this version changes, LiveStore will start with fresh database files. Old database files are not deleted.
+ *
+ * While LiveStore is in alpha, this might happen more frequently.
+ * In the future, LiveStore will provide a migration path for older database files to avoid the impression of data loss.
+ */
+export const liveStoreStorageFormatVersion = 2;
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAE/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAA"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/D,oEAAoE;AAEpE,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAA;AAEnD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/common",
-  "version": "0.0.58-dev.0",
+  "version": "0.0.58-dev.10",
   "type": "module",
   "exports": {
     ".": {
@@ -14,6 +14,14 @@
     "./schema": {
       "types": "./dist/schema/index.d.ts",
       "default": "./dist/schema/index.js"
+    },
+    "./sync/next": {
+      "types": "./dist/sync/next/mod.d.ts",
+      "default": "./dist/sync/next/mod.js"
+    },
+    "./sync/next/test": {
+      "types": "./dist/sync/next/test/mod.d.ts",
+      "default": "./dist/sync/next/test/mod.js"
     }
   },
   "types": "./dist/index.d.ts",
@@ -24,16 +32,25 @@
       ],
       "sql-queries": [
         "./dist/sql-queries/index.d.ts"
+      ],
+      "sync/next": [
+        "./dist/sync/next/mod.d.ts"
+      ],
+      "sync/next/test": [
+        "./dist/sync/next/test/mod.d.ts"
       ]
     }
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@livestore/utils": "0.0.58-dev.0",
-    "effect-db-schema": "0.0.58-dev.0"
+    "graphology": "0.26.0-alpha1",
+    "graphology-dag": "0.4.1",
+    "graphology-types": "0.24.7",
+    "@livestore/utils": "0.0.58-dev.10",
+    "@livestore/db-schema": "0.0.58-dev.10"
   },
   "devDependencies": {
-    "vitest": "^2.0.4"
+    "vitest": "^2.1.4"
   },
   "publishConfig": {
     "access": "public"

package/src/adapter-types.ts

@@ -9,9 +9,10 @@ export interface PreparedStatement {
   execute(bindValues: PreparedBindValues | undefined, options?: { onRowsChanged?: (rowsChanged: number) => void }): void
   select<T>(bindValues: PreparedBindValues | undefined): ReadonlyArray<T>
   finalize(): void
+  sql: string
 }
 
-export type StoreAdapter = {
+export type ClientSession = {
   /** SQLite database with synchronous API running in the same thread (usually in-memory) */
   syncDb: SynchronousDatabase
   /** The coordinator is responsible for persisting the database, syncing etc */
@@ -28,6 +29,7 @@ export type SynchronousDatabase = {
   ): void
   select<T>(queryStr: string, bindValues?: PreparedBindValues | undefined): ReadonlyArray<T>
   export(): Uint8Array
+  close(): void
 }
 
 export type ResetMode = 'all-data' | 'only-app-db'
@@ -60,24 +62,62 @@ export type BootStatus = typeof BootStatus.Type
 export type Coordinator = {
   devtools: {
     enabled: boolean
+    // TODO incorporate sessionId and rethink appHostId
     appHostId: string
   }
+  sessionId: string
   // TODO is exposing the lock status really needed (or only relevant for web adapter?)
   lockStatus: SubscriptionRef.SubscriptionRef<LockStatus>
-  syncMutations: Stream.Stream<MutationEvent.AnyEncoded, UnexpectedError>
+  syncMutations: Stream.Stream<MutationEvent.Any, UnexpectedError>
   execute(queryStr: string, bindValues: PreparedBindValues | undefined): Effect.Effect<void, UnexpectedError>
-  mutate(mutationEventEncoded: MutationEvent.Any, options: { persisted: boolean }): Effect.Effect<void, UnexpectedError>
+  mutate(
+    mutationEventEncoded: MutationEvent.AnyEncoded,
+    options: { persisted: boolean },
+  ): Effect.Effect<void, UnexpectedError>
+  /** Can be called synchronously */
+  nextMutationEventIdPair: (opts: { localOnly: boolean }) => Effect.Effect<EventIdPair, UnexpectedError>
+  /** Used to initially get the current mutation event id to use as `parentId` for the next mutation event */
+  getCurrentMutationEventId: Effect.Effect<EventId, UnexpectedError>
   export: Effect.Effect<Uint8Array | undefined, UnexpectedError>
   getMutationLogData: Effect.Effect<Uint8Array, UnexpectedError>
   networkStatus: SubscriptionRef.SubscriptionRef<NetworkStatus>
 }
 
+/**
+ * Can be used in queries to refer to the current session id.
+ * Will be replaced with the actual session id at runtime
+ *
+ * Example:
+ * ```ts
+ * const query$ = rowQuery(tables.app, SessionIdSymbol)
+ * ```
+ */
+export const SessionIdSymbol = Symbol.for('@livestore/session-id')
+export type SessionIdSymbol = typeof SessionIdSymbol
+
 export type LockStatus = 'has-lock' | 'no-lock'
 
+/**
+ * LiveStore event id value consisting of a globally unique event sequence number
+ * and a local sequence number.
+ *
+ * The local sequence number is only used for localOnly mutations and starts from 0 for each global sequence number.
+ */
+export type EventId = { global: number; local: number }
+
+export const EventId = Schema.Struct({
+  global: Schema.Number,
+  local: Schema.Number,
+}).annotations({ title: 'LiveStore.EventId' })
+
+export type EventIdPair = { id: EventId; parentId: EventId }
+
+export const ROOT_ID = { global: -1, local: 0 } satisfies EventId
+
 export type BootDb = {
   _tag: 'BootDb'
   execute(queryStr: string, bindValues?: PreparedBindValues): void
-  mutate: <const TMutationArg extends ReadonlyArray<MutationEvent.Any>>(...list: TMutationArg) => void
+  mutate: <const TMutationArg extends ReadonlyArray<MutationEvent.PartialAny>>(...list: TMutationArg) => void
   select<T>(queryStr: string, bindValues?: PreparedBindValues): ReadonlyArray<T>
   txn(callback: () => void): void
 }
@@ -89,7 +129,6 @@ export class UnexpectedError extends Schema.TaggedError<UnexpectedError>()('Live
 }) {
   static mapToUnexpectedError = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
     effect.pipe(
-      Effect.tapCauseLogPretty,
       Effect.mapError((cause) => (Schema.is(UnexpectedError)(cause) ? cause : new UnexpectedError({ cause }))),
       Effect.catchAllDefect((cause) => new UnexpectedError({ cause })),
     )
@@ -167,11 +206,11 @@ export type ConnectDevtoolsToStore = (
   storeDevtoolsChannel: StoreDevtoolsChannel,
 ) => Effect.Effect<void, UnexpectedError, Scope.Scope>
 
-export type StoreAdapterFactory = (opts: {
+export type Adapter = (opts: {
   schema: LiveStoreSchema
   storeId: string
   devtoolsEnabled: boolean
   bootStatusQueue: Queue.Queue<BootStatus>
   shutdown: (cause: Cause.Cause<any>) => Effect.Effect<void>
   connectDevtoolsToStore: ConnectDevtoolsToStore
-}) => Effect.Effect<StoreAdapter, UnexpectedError, Scope.Scope>
+}) => Effect.Effect<ClientSession, UnexpectedError, Scope.Scope>

package/src/bounded-collections.ts

@@ -16,7 +16,7 @@ export class BoundMap<K, V> {
     this.#map.set(key, value)
     // console.log(this.#map.size, this.#sizeLimit);
     if (this.#map.size > this.#sizeLimit) {
-      const firstKey = this.#map.keys().next().value
+      const firstKey = this.#map.keys().next().value as K
       const deletedValue = this.#map.get(firstKey)!
       this.#map.delete(firstKey)
       if (this.onEvict) {

package/src/derived-mutations.test.ts

@@ -94,7 +94,8 @@ describe('derived mutations', () => {
   })
 })
 
-const patchId = (muationEvent: MutationEvent.Any) => {
+const patchId = (muationEvent: MutationEvent.PartialAny) => {
+  // TODO use new id paradigm
   const id = `00000000-0000-0000-0000-000000000000`
   return { ...muationEvent, id }
 }

package/src/derived-mutations.ts

@@ -1,6 +1,6 @@
+import type { SqliteDsl } from '@livestore/db-schema'
 import type { GetValForKey } from '@livestore/utils'
 import { ReadonlyRecord, Schema } from '@livestore/utils/effect'
-import type { SqliteDsl } from 'effect-db-schema'
 
 import type { MutationEvent } from './schema/mutations.js'
 import { defineMutation } from './schema/mutations.js'
@@ -38,9 +38,9 @@ export const deriveCreateMutationDef = <
     (col) => col.nullable === false && col.default._tag === 'None',
   )
 
-  const insertSchema = Schema.Struct(ReadonlyRecord.map(requiredColumns, (col) => col.schema)).pipe(
-    Schema.extend(Schema.partial(Schema.Struct(ReadonlyRecord.map(optionalFields, (col) => col.schema)))),
-  )
+  const insertSchema = Schema.Struct(ReadonlyRecord.map(requiredColumns, (col) => col.schema))
+    .pipe(Schema.extend(Schema.partial(Schema.Struct(ReadonlyRecord.map(optionalFields, (col) => col.schema)))))
+    .annotations({ title: `${tableName}:Insert` })
 
   return defineMutation(
     `_Derived_Create_${tableName}`,
@@ -76,7 +76,7 @@ export const deriveUpdateMutationDef = <
     Schema.Struct({
       where: Schema.partial(table.schema),
       values: Schema.partial(table.schema),
-    }),
+    }).annotations({ title: `${tableName}:Update` }),
     ({ where, values }) => {
       const [sql, bindValues] = updateRows({
         tableName: table.sqliteDef.name,
@@ -140,8 +140,8 @@ export namespace DerivedMutationHelperFns {
   > = SqliteDsl.AnyIfConstained<
     TColumns,
     UseShortcut<TOptions> extends true
-      ? (values?: GetValForKey<SqliteDsl.FromColumns.InsertRowDecoded<TColumns>, 'value'>) => MutationEvent.Any
-      : (values: SqliteDsl.FromColumns.InsertRowDecoded<TColumns>) => MutationEvent.Any
+      ? (values?: GetValForKey<SqliteDsl.FromColumns.InsertRowDecoded<TColumns>, 'value'>) => MutationEvent.PartialAny
+      : (values: SqliteDsl.FromColumns.InsertRowDecoded<TColumns>) => MutationEvent.PartialAny
   >
 
   export type UpdateMutationFn<
@@ -150,17 +150,17 @@ export namespace DerivedMutationHelperFns {
   > = SqliteDsl.AnyIfConstained<
     TColumns,
     UseShortcut<TOptions> extends true
-      ? (values: Partial<GetValForKey<SqliteDsl.FromColumns.RowDecoded<TColumns>, 'value'>>) => MutationEvent.Any
+      ? (values: Partial<GetValForKey<SqliteDsl.FromColumns.RowDecoded<TColumns>, 'value'>>) => MutationEvent.PartialAny
       : (args: {
           where: Partial<SqliteDsl.FromColumns.RowDecoded<TColumns>>
           values: Partial<SqliteDsl.FromColumns.RowDecoded<TColumns>>
-        }) => MutationEvent.Any
+        }) => MutationEvent.PartialAny
   >
 
   export type DeleteMutationFn<
     TColumns extends SqliteDsl.ConstraintColumns,
     _TOptions extends DbSchema.TableOptions,
-  > = (args: { where: Partial<SqliteDsl.FromColumns.RowDecoded<TColumns>> }) => MutationEvent.Any
+  > = (args: { where: Partial<SqliteDsl.FromColumns.RowDecoded<TColumns>> }) => MutationEvent.PartialAny
 
   type UseShortcut<TOptions extends DbSchema.TableOptions> = TOptions['isSingleColumn'] extends true
     ? TOptions['isSingleton'] extends true

package/src/devtools/devtools-bridge.ts

@@ -9,5 +9,5 @@ export type PrepareDevtoolsBridge = {
   appHostId: string
   copyToClipboard: (text: string) => Effect.Effect<void>
   sendEscapeKey?: Effect.Effect<void>
-  isLeaderTab: boolean
+  isLeader: boolean
 }

package/src/devtools/devtools-messages.ts

@@ -74,7 +74,7 @@ export class MutationBroadcast extends LSDMessage('LSD.MutationBroadcast', {
 }) {}
 
 export class RunMutationReq extends LSDReqResMessage('LSD.RunMutationReq', {
-  mutationEventEncoded: mutationEventSchemaEncodedAny,
+  mutationEventEncoded: mutationEventSchemaEncodedAny.pipe(Schema.omit('id', 'parentId')),
   persisted: Schema.Boolean,
 }) {}
 
@@ -158,12 +158,19 @@ export class SyncingInfoRes extends LSDReqResMessage('LSD.SyncingInfoRes', {
   syncingInfo: SyncingInfo,
 }) {}
 
+export class SyncHistorySubscribe extends LSDReqResMessage('LSD.SyncHistorySubscribe', {}) {}
+export class SyncHistoryUnsubscribe extends LSDReqResMessage('LSD.SyncHistoryUnsubscribe', {}) {}
+export class SyncHistoryRes extends LSDReqResMessage('LSD.SyncHistoryRes', {
+  mutationEventEncoded: mutationEventSchemaEncodedAny,
+  metadata: Schema.Option(Schema.JsonValue),
+}) {}
+
 export class DevtoolsReady extends LSDMessage('LSD.DevtoolsReady', {}) {}
 
 export class DevtoolsConnected extends LSDChannelMessage('LSD.DevtoolsConnected', {}) {}
 
 export class AppHostReady extends LSDChannelMessage('LSD.AppHostReady', {
-  isLeaderTab: Schema.Boolean,
+  isLeader: Schema.Boolean,
 }) {}
 
 export class Disconnect extends LSDChannelMessage('LSD.Disconnect', {}) {}
@@ -186,6 +193,8 @@ export const MessageToAppHostCoordinator = Schema.Union(
   RunMutationReq,
   Ping,
   DatabaseFileInfoReq,
+  SyncHistorySubscribe,
+  SyncHistoryUnsubscribe,
   SyncingInfoReq,
 ).annotations({ identifier: 'LSD.MessageToAppHostCoordinator' })
 
@@ -219,6 +228,7 @@ export const MessageFromAppHostCoordinator = Schema.Union(
   RunMutationRes,
   Pong,
   DatabaseFileInfoRes,
+  SyncHistoryRes,
   SyncingInfoRes,
 ).annotations({ identifier: 'LSD.MessageFromAppHostCoordinator' })
 

package/src/devtools/index.ts

@@ -8,6 +8,7 @@ export * from './devtools-bridge.js'
 export namespace WebBridge {
   export class AppHostReady extends Schema.TaggedStruct('LSD.WebBridge.AppHostReady', {
     appHostId: Schema.String,
+    // storeId: Schema.String,
     isLeader: Schema.Boolean,
   }) {}
 
@@ -24,6 +25,7 @@ export namespace WebBridge {
      */
     webBridgeId: Schema.String,
     isLeader: Schema.Boolean,
+    storeId: Schema.String,
   }) {}
 
   export class AppHostWillDisconnect extends Schema.TaggedStruct('LSD.WebBridge.AppHostWillDisconnect', {

package/src/index.ts

@@ -12,3 +12,9 @@ export * as Devtools from './devtools/index.js'
 export * from './debug-info.js'
 export * from './bounded-collections.js'
 export * from './version.js'
+
+declare global {
+  interface LiveStoreGlobal {
+    // syncBackend: never
+  }
+}

package/src/rehydrate-from-mutationlog.ts

@@ -3,7 +3,7 @@ import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect'
 
 import { type MigrationOptionsFromMutationLog, type SynchronousDatabase, UnexpectedError } from './adapter-types.js'
 import { getExecArgsFromMutation } from './mutation.js'
-import type { LiveStoreSchema, MutationDef, MutationLogMetaRow } from './schema/index.js'
+import type { LiveStoreSchema, MutationDef, MutationEvent, MutationLogMetaRow } from './schema/index.js'
 import { MUTATION_LOG_META_TABLE } from './schema/index.js'
 import type { PreparedBindValues } from './util.js'
 import { sql } from './util.js'
@@ -54,10 +54,11 @@ This likely means the schema has changed in an incompatible way.
         )
 
         const mutationEventDecoded = {
-          id: row.id,
+          id: { global: row.idGlobal, local: row.idLocal },
+          parentId: { global: row.parentIdGlobal, local: row.parentIdLocal },
           mutation: row.mutation,
           args: argsDecoded,
-        }
+        } satisfies MutationEvent.Any
 
         const execArgsArr = getExecArgsFromMutation({ mutationDef, mutationEventDecoded })
 
@@ -84,8 +85,8 @@ This likely means the schema has changed in an incompatible way.
 
     const stmt = logDb.prepare(sql`\
 SELECT * FROM ${MUTATION_LOG_META_TABLE} 
-WHERE id > COALESCE($id, '') 
-ORDER BY id ASC
+WHERE idGlobal > COALESCE($idGlobal, '') AND idLocal > COALESCE($idLocal, '')
+ORDER BY idGlobal ASC, idLocal ASC
 LIMIT ${CHUNK_SIZE}
 `)
 
@@ -97,9 +98,17 @@ LIMIT ${CHUNK_SIZE}
         // End stream if no more rows
         if (Chunk.isChunk(item) && item.length === 0) return Option.none()
 
-        const lastId = Chunk.isChunk(item) ? Chunk.last(item).pipe(Option.getOrUndefined)?.id : undefined
+        const lastId = Chunk.isChunk(item)
+          ? Chunk.last(item).pipe(
+              Option.map((_) => ({ global: _.idGlobal, local: _.idLocal })),
+              Option.getOrUndefined,
+            )
+          : undefined
         const nextItem = Chunk.fromIterable(
-          stmt.select<MutationLogMetaRow>({ $id: lastId } as any as PreparedBindValues),
+          stmt.select<MutationLogMetaRow>({
+            $idGlobal: lastId?.global,
+            $idLocal: lastId?.local,
+          } as any as PreparedBindValues),
         )
         const prevItem = Chunk.isChunk(item) ? item : Chunk.empty()
         return Option.some([prevItem, nextItem])