@livestore/common 0.4.0 → 0.5.0-dev.0

package/dist/util.d.ts

@@ -1,10 +1,17 @@
-import type { Brand } from '@livestore/utils/effect';
-import { Schema } from '@livestore/utils/effect';
+import { type Brand, Schema } from '@livestore/utils/effect';
 export type ParamsObject = Record<string, SqlValue>;
 export type SqlValue = string | number | Uint8Array<ArrayBuffer> | null;
 export type Bindable = ReadonlyArray<SqlValue> | ParamsObject;
-export declare const SqlValueSchema: Schema.Union<[typeof Schema.String, typeof Schema.Number, Schema.Schema<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>, never>, typeof Schema.Null]>;
-export declare const PreparedBindValues: Schema.brand<Schema.Union<[Schema.Array$<Schema.Union<[typeof Schema.String, typeof Schema.Number, Schema.Schema<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>, never>, typeof Schema.Null]>>, Schema.Record$<typeof Schema.String, Schema.Union<[typeof Schema.String, typeof Schema.Number, Schema.Schema<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>, never>, typeof Schema.Null]>>]>, "PreparedBindValues">;
+/**
+ * Numeric schema for the SQLite `REAL` domain. Unlike `Schema.Finite` it accepts
+ * `Infinity`/`NaN`, because SQLite `REAL` columns can legitimately store them and
+ * bind values / DEFAULT codecs must round-trip those through the devtools/debug
+ * protocol. This is the single carve-out for the SQLite REAL numeric domain — use it
+ * instead of a bare `Schema.Number` so the `schemaNumber` exception lives in one place.
+ */
+export declare const SqliteReal: Schema.Number;
+export declare const SqlValueSchema: Schema.Union<readonly [Schema.String, Schema.Number, Schema.Codec<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>, never, never>, Schema.Null]>;
+export declare const PreparedBindValues: Schema.brand<Schema.Union<readonly [Schema.$Array<Schema.Union<readonly [Schema.String, Schema.Number, Schema.Codec<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>, never, never>, Schema.Null]>>, Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.Number, Schema.Codec<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>, never, never>, Schema.Null]>>]>, "PreparedBindValues">;
 export type PreparedBindValues = Brand.Branded<Bindable, 'PreparedBindValues'>;
 /**
  * This is a tag function for tagged literals.

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AACnD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI,CAAA;AAEvE,MAAM,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;AAE7D,eAAO,MAAM,cAAc,wJAK1B,CAAA;AAED,eAAO,MAAM,kBAAkB,yZAGW,CAAA;AAE1C,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAA;AAE9E;;;;;GAKG;AACH,eAAO,MAAM,GAAG,GAAI,UAAU,oBAAoB,EAAE,GAAG,MAAM,OAAO,EAAE,KAAG,MAQxE,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAAI,QAAQ,QAAQ,EAAE,WAAW,MAAM,KAAG,kBAWvE,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAE5D,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AACnD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI,CAAA;AAEvE,MAAM,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;AAE7D;;;;;;GAMG;AAEH,eAAO,MAAM,UAAU,eAAgB,CAAA;AAEvC,eAAO,MAAM,cAAc,kJAKzB,CAAA;AAEF,eAAO,MAAM,kBAAkB,+YAGY,CAAA;AAE3C,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAA;AAE9E;;;;;GAKG;AACH,eAAO,MAAM,GAAG,GAAI,UAAU,oBAAoB,EAAE,GAAG,MAAM,OAAO,EAAE,KAAG,MAQxE,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAAI,QAAQ,QAAQ,EAAE,WAAW,MAAM,KAAG,kBAWvE,CAAA"}

package/dist/util.js

@@ -1,7 +1,24 @@
 /// <reference lib="es2022" />
 import { Schema } from '@livestore/utils/effect';
-export const SqlValueSchema = Schema.Union(Schema.String, Schema.Number, Schema.Uint8Array, Schema.Null);
-export const PreparedBindValues = Schema.Union(Schema.Array(SqlValueSchema), Schema.Record({ key: Schema.String, value: SqlValueSchema })).pipe(Schema.brand('PreparedBindValues'));
+/**
+ * Numeric schema for the SQLite `REAL` domain. Unlike `Schema.Finite` it accepts
+ * `Infinity`/`NaN`, because SQLite `REAL` columns can legitimately store them and
+ * bind values / DEFAULT codecs must round-trip those through the devtools/debug
+ * protocol. This is the single carve-out for the SQLite REAL numeric domain — use it
+ * instead of a bare `Schema.Number` so the `schemaNumber` exception lives in one place.
+ */
+// @effect-diagnostics-next-line schemaNumber:off -- see SqliteReal docstring: SQLite REAL permits Infinity/NaN, so Schema.Finite would wrongly reject valid values
+export const SqliteReal = Schema.Number;
+export const SqlValueSchema = Schema.Union([
+    Schema.String,
+    SqliteReal,
+    Schema.Uint8Array,
+    Schema.Null,
+]);
+export const PreparedBindValues = Schema.Union([
+    Schema.Array(SqlValueSchema),
+    Schema.Record(Schema.String, SqlValueSchema),
+]).pipe(Schema.brand('PreparedBindValues'));
 /**
  * This is a tag function for tagged literals.
  * it lets us get syntax highlighting on SQL queries in VSCode, but

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAG9B,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAOhD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CACxC,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,UAA2D,EAClE,MAAM,CAAC,IAAI,CACZ,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAC5C,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAC5B,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAC7D,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAA;AAI1C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,QAA8B,EAAE,GAAG,IAAe,EAAU,EAAE;IAChF,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,KAAK,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACtC,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC5C,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAgB,EAAE,SAAiB,EAAsB,EAAE;IAC3F,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI;QAAE,OAAO,MAAmC,CAAA;IAE9E,MAAM,MAAM,GAAiB,EAAE,CAAA;IAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,KAAK,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,MAA4B,CAAA;AACrC,CAAC,CAAA"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAE9B,OAAO,EAAc,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAO5D;;;;;;GAMG;AACH,mKAAmK;AACnK,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAA;AAEvC,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC;IACzC,MAAM,CAAC,MAAM;IACb,UAAU;IACV,MAAM,CAAC,UAA0D;IACjE,MAAM,CAAC,IAAI;CACZ,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC;IAC7C,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC;IAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC;CAC7C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAA;AAI3C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,QAA8B,EAAE,GAAG,IAAe,EAAU,EAAE;IAChF,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,KAAK,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACtC,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC5C,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAgB,EAAE,SAAiB,EAAsB,EAAE;IAC3F,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI;QAAE,OAAO,MAAmC,CAAA;IAE9E,MAAM,MAAM,GAAiB,EAAE,CAAA;IAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,KAAK,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,MAA4B,CAAA;AACrC,CAAC,CAAA"}

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAA0E,CAAA;AAEzG,eAAO,MAAM,uBAAuB,EAAE,MACqC,CAAA;AAE3E,eAAO,MAAM,iCAAiC,EAAE,aAAa,CAAC,MAAM,CAA6B,CAAA;AAEjG,eAAO,MAAM,8BAA8B,GAAI,SAAS,MAAM,GAAG,SAAS,KAAG,MAAsB,CAAA;AAEnG,eAAO,MAAM,kCAAkC,GAC7C,SAAS,MAAM,GAAG,SAAS,EAC3B,oBAAmB,aAAa,CAAC,MAAM,CAAqC,KAC3E,OAA8E,CAAA;AAEjF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,6BAA6B,IAAI,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAA0E,CAAA;AAEzG,eAAO,MAAM,uBAAuB,EAAE,MAAkF,CAAA;AAExH,eAAO,MAAM,iCAAiC,EAAE,aAAa,CAAC,MAAM,CAA6B,CAAA;AAEjG,eAAO,MAAM,8BAA8B,GAAI,SAAS,MAAM,GAAG,SAAS,KAAG,MAAsB,CAAA;AAEnG,eAAO,MAAM,kCAAkC,GAC7C,SAAS,MAAM,GAAG,SAAS,EAC3B,oBAAmB,aAAa,CAAC,MAAM,CAAqC,KAC3E,OAA8E,CAAA;AAEjF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,6BAA6B,IAAI,CAAA"}

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAEvD;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAY,UAAkB,CAAC,8BAA8B,IAAI,GAAG,CAAC,OAAO,CAAA;AAEzG,MAAM,CAAC,MAAM,uBAAuB,GACjC,UAAkB,CAAC,gDAAgD,IAAI,CAAC,CAAA;AAE3E,MAAM,CAAC,MAAM,iCAAiC,GAA0B,CAAC,uBAAuB,CAAC,CAAA;AAEjG,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,OAA2B,EAAU,EAAE,CAAC,OAAO,IAAI,CAAC,CAAA;AAEnG,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,OAA2B,EAC3B,oBAA2C,iCAAiC,EACnE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC,CAAA;AAEjF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAA"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAEvD;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAY,UAAkB,CAAC,8BAA8B,IAAI,GAAG,CAAC,OAAO,CAAA;AAEzG,MAAM,CAAC,MAAM,uBAAuB,GAAY,UAAkB,CAAC,gDAAgD,IAAI,CAAC,CAAA;AAExH,MAAM,CAAC,MAAM,iCAAiC,GAA0B,CAAC,uBAAuB,CAAC,CAAA;AAEjG,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,OAA2B,EAAU,EAAE,CAAC,OAAO,IAAI,CAAC,CAAA;AAEnG,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,OAA2B,EAC3B,oBAA2C,iCAAiC,EACnE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC,CAAA;AAEjF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/common",
-  "version": "0.4.0",
+  "version": "0.5.0-dev.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -28,52 +28,34 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@livestore/utils": "^0.4.0",
-    "@livestore/webmesh": "^0.4.0"
+    "@livestore/utils": "^0.5.0-dev.0",
+    "@livestore/webmesh": "^0.5.0-dev.0"
   },
   "devDependencies": {
-    "@effect/ai": "0.35.0",
-    "@effect/cli": "0.75.1",
-    "@effect/cluster": "0.58.2",
-    "@effect/experimental": "0.60.0",
-    "@effect/opentelemetry": "0.63.0",
-    "@effect/platform": "0.96.1",
-    "@effect/platform-browser": "0.76.0",
-    "@effect/platform-bun": "0.89.0",
-    "@effect/platform-node": "0.106.0",
-    "@effect/printer": "0.49.0",
-    "@effect/printer-ansi": "0.49.0",
-    "@effect/rpc": "0.75.1",
-    "@effect/sql": "0.51.1",
-    "@effect/typeclass": "0.40.0",
-    "@effect/vitest": "0.29.0",
+    "@effect/opentelemetry": "4.0.0-rc.111",
+    "@effect/platform-browser": "4.0.0-rc.111",
+    "@effect/platform-bun": "4.0.0-rc.111",
+    "@effect/platform-node": "4.0.0-rc.111",
+    "@effect/platform-node-shared": "4.0.0-rc.111",
+    "@effect/vitest": "4.0.0-rc.111",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/resources": "2.2.0",
     "@standard-schema/spec": "1.1.0",
-    "effect": "3.21.2",
-    "vitest": "3.2.4",
-    "@livestore/utils-dev": "^0.4.0"
+    "effect": "4.0.0-rc.111",
+    "vitest": "4.1.9",
+    "@livestore/utils-dev": "^0.5.0-dev.0"
   },
   "peerDependencies": {
-    "@effect/ai": "^0.35.0",
-    "@effect/cli": "^0.75.1",
-    "@effect/cluster": "^0.58.2",
-    "@effect/experimental": "^0.60.0",
-    "@effect/opentelemetry": "^0.63.0",
-    "@effect/platform": "^0.96.1",
-    "@effect/platform-browser": "^0.76.0",
-    "@effect/platform-bun": "^0.89.0",
-    "@effect/platform-node": "^0.106.0",
-    "@effect/printer": "^0.49.0",
-    "@effect/printer-ansi": "^0.49.0",
-    "@effect/rpc": "^0.75.1",
-    "@effect/sql": "^0.51.1",
-    "@effect/typeclass": "^0.40.0",
-    "@effect/vitest": "^0.29.0",
+    "@effect/opentelemetry": "^4.0.0-rc.111",
+    "@effect/platform-browser": "^4.0.0-rc.111",
+    "@effect/platform-bun": "^4.0.0-rc.111",
+    "@effect/platform-node": "^4.0.0-rc.111",
+    "@effect/platform-node-shared": "^4.0.0-rc.111",
+    "@effect/vitest": "^4.0.0-rc.111",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
     "@standard-schema/spec": "^1.1.0",
-    "effect": "^3.21.2"
+    "effect": "^4.0.0-rc.111"
   },
   "$genie": {
     "source": "package.json.genie.ts",

package/src/ClientSessionLeaderThreadProxy.ts

@@ -3,10 +3,10 @@ import type { Effect, Stream, Subscribable } from '@livestore/utils/effect'
 import type { StorageMode } from './adapter-types.ts'
 import type { MigrationsReport } from './defs.ts'
 import type * as Devtools from './devtools/mod.ts'
+import type { RejectedPushError } from './leader-thread/RejectedPushError.ts'
 import type { StreamEventsOptions } from './leader-thread/types.ts'
 import type * as EventSequenceNumber from './schema/EventSequenceNumber/mod.ts'
 import type { LiveStoreEvent } from './schema/mod.ts'
-import type { RejectedPushError } from './leader-thread/RejectedPushError.ts'
 import type { SyncBackend } from './sync/sync.ts'
 import type { PayloadUpstream, SyncState } from './sync/syncstate.ts'
 

package/src/MaterializationJournal.ts

@@ -0,0 +1,184 @@
+import { Context, Effect, Layer, Predicate, ReadonlyArray, Schema } from '@livestore/utils/effect'
+
+import { SqliteError, type SqliteDb } from './adapter-types.ts'
+import { execSql, execSqlPrepared } from './leader-thread/connection.ts'
+import * as EventSequenceNumber from './schema/EventSequenceNumber/mod.ts'
+import { SystemTables } from './schema/mod.ts'
+import { findManyRows, insertRow } from './sql-queries/index.ts'
+import * as SqliteDbHelper from './sqlite-db-helper.ts'
+import { prepareBindValues, sql } from './util.ts'
+
+export const TypeId = '~@livestore/common/MaterializationJournal' as const
+export type TypeId = typeof TypeId
+
+export const MaterializationJournalErrorTypeId = '~@livestore/common/MaterializationJournalError' as const
+
+export const isMaterializationJournalError = (u: unknown): u is MaterializationJournalError =>
+  Predicate.hasProperty(u, MaterializationJournalErrorTypeId)
+
+export class MaterializationJournalError extends Schema.TaggedError<MaterializationJournalError>(
+  MaterializationJournalErrorTypeId,
+)('MaterializationJournalError', {
+  method: Schema.Literals(['record', 'rollback', 'discardUpTo']),
+  cause: Schema.Defect(),
+}) {
+  readonly [MaterializationJournalErrorTypeId] = MaterializationJournalErrorTypeId
+}
+
+export type MaterializationChangeset = { _tag: 'changeset'; data: Uint8Array<ArrayBuffer> } | { _tag: 'no-op' }
+
+export type MaterializationRecord = {
+  key: EventSequenceNumber.Client.Composite
+  changeset: MaterializationChangeset
+}
+
+export interface Service {
+  readonly [TypeId]: TypeId
+  /** Stores a materialization record, replacing any record at the same key. */
+  record: (record: MaterializationRecord) => Effect.Effect<void, MaterializationJournalError>
+  /** Reverts the keyed materializations in reverse order, then discards their records. */
+  rollback: (
+    keys: ReadonlyArray<EventSequenceNumber.Client.Composite>,
+  ) => Effect.Effect<void, MaterializationJournalError>
+  /** Discards records whose key is less than or equal to `key`, ignoring rebase generation. */
+  discardUpTo: (key: EventSequenceNumber.Client.Composite) => Effect.Effect<void, MaterializationJournalError>
+}
+
+export class MaterializationJournal extends Context.Service<MaterializationJournal, Service>()(
+  '@livestore/common/MaterializationJournal',
+) {}
+
+interface Options {
+  readonly dbState: SqliteDb
+}
+
+export const make = ({ dbState }: Options) => {
+  const deleteByKeys = Effect.fnUntraced(function* (keys: ReadonlyArray<EventSequenceNumber.Client.Composite>) {
+    // Keep DELETE statements below SQLite's bound-parameter limit.
+    const keyChunks = ReadonlyArray.chunksOf(100)(keys)
+
+    for (const keyChunk of keyChunks) {
+      const placeholders = keyChunk.map(() => '(?, ?, ?)').join(', ')
+      const bindValues = keyChunk.flatMap((key) => [key.global, key.client, key.rebaseGeneration])
+      const statement = sql`DELETE FROM ${SystemTables.MATERIALIZATION_JOURNAL_META_TABLE}
+                            WHERE (seqNumGlobal, seqNumClient, seqNumRebaseGeneration) IN (${placeholders})`
+
+      yield* execSqlPrepared(dbState, statement, prepareBindValues(bindValues, statement))
+    }
+  }, SqliteDbHelper.withSavepoint(dbState))
+
+  return MaterializationJournal.of({
+    [TypeId]: TypeId,
+    record: Effect.fnUntraced(
+      function* (record: MaterializationRecord) {
+        yield* deleteByKeys([record.key])
+
+        // Generate the parameterized INSERT statement
+        const [statement, bindValues] = insertRow({
+          tableName: SystemTables.MATERIALIZATION_JOURNAL_META_TABLE,
+          columns: SystemTables.materializationJournalMetaTable.sqliteDef.columns,
+          values: {
+            seqNumGlobal: record.key.global,
+            seqNumClient: record.key.client,
+            seqNumRebaseGeneration: record.key.rebaseGeneration,
+            changeset: record.changeset._tag === 'changeset' ? record.changeset.data : null,
+            // Legacy processors still expose this column for development diagnostics.
+            debug: null,
+          },
+        })
+
+        yield* execSqlPrepared(dbState, statement, prepareBindValues(bindValues, statement))
+      },
+      SqliteDbHelper.withSavepoint(dbState),
+      Effect.mapError((cause) => new MaterializationJournalError({ method: 'record', cause })),
+    ),
+    rollback: Effect.fnUntraced(
+      function* (keys: ReadonlyArray<EventSequenceNumber.Client.Composite>) {
+        const sortedKeys = keys.toSorted((a, b) => EventSequenceNumber.Client.compare(b, a))
+        const rollbackRecords = yield* Effect.forEach(
+          sortedKeys,
+          Effect.fnUntraced(function* (key) {
+            const [statement, bindValues] = findManyRows({
+              tableName: SystemTables.MATERIALIZATION_JOURNAL_META_TABLE,
+              columns: SystemTables.materializationJournalMetaTable.sqliteDef.columns,
+              where: {
+                seqNumGlobal: key.global,
+                seqNumClient: key.client,
+                seqNumRebaseGeneration: key.rebaseGeneration,
+              },
+              limit: 1,
+            })
+            const preparedBindValues = prepareBindValues(bindValues, statement)
+            const row = yield* Effect.try({
+              try: () => dbState.select<SystemTables.MaterializationJournalMetaRow>(statement, preparedBindValues)[0],
+              catch: (cause) => new SqliteError({ cause, query: { sql: statement, bindValues: preparedBindValues } }),
+            })
+
+            if (row === undefined) {
+              return yield* new MaterializationJournalError({
+                method: 'rollback',
+                cause: new Error(
+                  `Missing materialization journal record for ${EventSequenceNumber.Client.toString(key)}`,
+                ),
+              })
+            }
+
+            return {
+              key,
+              changeset:
+                row.changeset === null
+                  ? { _tag: 'no-op' as const }
+                  : { _tag: 'changeset' as const, data: row.changeset },
+            }
+          }),
+        )
+
+        for (const record of rollbackRecords) {
+          if (record.changeset._tag === 'changeset') {
+            const data = record.changeset.data
+            yield* Effect.try({
+              try: () => dbState.makeChangeset(data).invert().apply(),
+              catch: (cause) => new SqliteError({ cause }),
+            })
+          }
+        }
+
+        yield* deleteByKeys(sortedKeys)
+      },
+      SqliteDbHelper.withSavepoint(dbState),
+      Effect.mapError((cause) =>
+        isMaterializationJournalError(cause) === true
+          ? cause
+          : new MaterializationJournalError({ method: 'rollback', cause }),
+      ),
+    ),
+    discardUpTo: Effect.fnUntraced(
+      function* (key: EventSequenceNumber.Client.Composite) {
+        yield* execSql(
+          dbState,
+          sql`DELETE FROM ${SystemTables.MATERIALIZATION_JOURNAL_META_TABLE}
+              WHERE seqNumGlobal < ${key.global}
+                 OR (
+                  seqNumGlobal = ${key.global}
+                      AND seqNumClient <= ${key.client}
+                  )`,
+          {},
+        )
+      },
+      SqliteDbHelper.withSavepoint(dbState),
+      Effect.mapError((cause) => new MaterializationJournalError({ method: 'discardUpTo', cause })),
+    ),
+  })
+}
+
+export const layer = (options: Options) => Layer.succeed(MaterializationJournal, make(options))
+
+export const layerTest = Layer.succeed(
+  MaterializationJournal,
+  MaterializationJournal.of({
+    [TypeId]: TypeId,
+    record: () => Effect.void,
+    rollback: () => Effect.void,
+    discardUpTo: () => Effect.void,
+  }),
+)

package/src/StateHead.ts

@@ -0,0 +1,80 @@
+import { Context, Effect, Layer } from '@livestore/utils/effect'
+
+import type { SqliteDb, SqliteError } from './adapter-types.ts'
+import { execSql, selectSql } from './leader-thread/connection.ts'
+import * as EventSequenceNumber from './schema/EventSequenceNumber/mod.ts'
+import { SystemTables } from './schema/mod.ts'
+import { findManyRows, insertRow } from './sql-queries/index.ts'
+
+export const TypeId = '~@livestore/common/StateHead' as const
+export type TypeId = typeof TypeId
+
+const STATE_HEAD_ROW_ID = 1
+
+/**
+ * Persists and reads the latest event sequence number reflected by the state database.
+ */
+export interface Service {
+  readonly [TypeId]: TypeId
+  /** Persists the latest event sequence number reflected by the state database. */
+  set: (head: EventSequenceNumber.Client.Composite) => Effect.Effect<void, SqliteError>
+  /** Returns the persisted head, or the root when the current-schema table has no row. */
+  get: Effect.Effect<EventSequenceNumber.Client.Composite, SqliteError>
+}
+
+export class StateHead extends Context.Service<StateHead, Service>()('@livestore/common/StateHead') {}
+
+interface Options {
+  readonly dbState: SqliteDb
+}
+
+export const make = ({ dbState }: Options) => {
+  return StateHead.of({
+    [TypeId]: TypeId,
+    set: (head) => {
+      const [statement, bindValues] = insertRow({
+        tableName: SystemTables.STATE_HEAD_META_TABLE,
+        columns: SystemTables.stateHeadMetaTable.sqliteDef.columns,
+        values: {
+          id: STATE_HEAD_ROW_ID,
+          seqNumGlobal: head.global,
+          seqNumClient: head.client,
+          seqNumRebaseGeneration: head.rebaseGeneration,
+        },
+        options: { orReplace: true },
+      })
+
+      return execSql(dbState, statement, bindValues)
+    },
+    get: Effect.suspend(() => {
+      const [statement, bindValues] = findManyRows({
+        tableName: SystemTables.STATE_HEAD_META_TABLE,
+        columns: SystemTables.stateHeadMetaTable.sqliteDef.columns,
+        where: { id: STATE_HEAD_ROW_ID },
+        limit: 1,
+      })
+      return selectSql<SystemTables.StateHeadMetaRow>(dbState, statement, bindValues).pipe(
+        Effect.map(([row]) =>
+          row === undefined
+            ? EventSequenceNumber.Client.ROOT
+            : EventSequenceNumber.Client.Composite.make({
+                global: row.seqNumGlobal,
+                client: row.seqNumClient,
+                rebaseGeneration: row.seqNumRebaseGeneration,
+              }),
+        ),
+      )
+    }),
+  })
+}
+
+export const layer = (options: Options) => Layer.succeed(StateHead, make(options))
+
+export const layerTest = Layer.succeed(
+  StateHead,
+  StateHead.of({
+    [TypeId]: TypeId,
+    set: () => Effect.void,
+    get: Effect.succeed(EventSequenceNumber.Client.ROOT),
+  }),
+)

package/src/WorkerTransportError.ts

@@ -1,12 +1,12 @@
-import { ParseResult, WorkerError } from '@livestore/utils/effect'
+import { Schema, WorkerError } from '@livestore/utils/effect'
 
 /**
  * Type guard that identifies infrastructure errors from the Effect Worker transport layer.
  *
  * @remarks
  *
- * These errors ({@link WorkerError.WorkerError}, {@link ParseResult.ParseError}) represent communication failures between
+ * These errors ({@link WorkerError.WorkerError}, {@link Schema.SchemaError}) represent communication failures between
  * threads/processes — not application-level failures.
  */
-export const isWorkerTransportError = (e: unknown): e is WorkerError.WorkerError | ParseResult.ParseError =>
-  ParseResult.isParseError(e) || WorkerError.isWorkerError(e)
+export const isWorkerTransportError = (e: unknown): e is WorkerError.WorkerError | Schema.SchemaError =>
+  Schema.isSchemaError(e) || WorkerError.isWorkerError(e)

package/src/__tests__/fixture.ts

@@ -1,7 +1,7 @@
 import { Schema } from '@livestore/utils/effect'
 
-import { SessionIdSymbol } from '../adapter-types.ts'
 import { makeSchema, State } from '../schema/mod.ts'
+import { SessionIdSymbol } from '../session-id-symbol.ts'
 
 export const UiState = State.SQLite.clientDocument({
   name: 'UiState',
@@ -14,8 +14,8 @@ export const UiState = State.SQLite.clientDocument({
 })
 
 const Config = Schema.Struct({
-  fontSize: Schema.Number,
-  theme: Schema.Literal('light', 'dark'),
+  fontSize: Schema.Finite,
+  theme: Schema.Literals(['light', 'dark']),
 })
 
 export const appConfig = State.SQLite.clientDocument({

package/src/adapter-types.ts

@@ -2,6 +2,7 @@ import {
   type Effect,
   type Exit,
   type Queue,
+  type Latch,
   Schema,
   type Scope,
   type SubscriptionRef,
@@ -28,16 +29,13 @@ export * from './sqlite-types.ts'
 export interface ClientSession {
   /** SQLite database with synchronous API running in the same thread (usually in-memory) */
   sqliteDb: SqliteDb
-  devtools: { enabled: false } | { enabled: true; pullLatch: Effect.Latch; pushLatch: Effect.Latch }
+  devtools: { enabled: false } | { enabled: true; pullLatch: Latch.Latch; pushLatch: Latch.Latch }
   clientId: string
   sessionId: string
   /** Status info whether current session is leader or not */
   lockStatus: SubscriptionRef.SubscriptionRef<LockStatus>
   shutdown: (
-    cause: Exit.Exit<
-      IntentionalShutdownCause,
-      UnknownError | MaterializeError | BackendIdMismatchError
-    >,
+    cause: Exit.Exit<IntentionalShutdownCause, UnknownError | MaterializeError | BackendIdMismatchError>,
   ) => Effect.Effect<void>
   /** A proxy API to communicate with the leader thread */
   leaderThread: ClientSessionLeaderThreadProxy
@@ -48,8 +46,8 @@ export interface ClientSession {
 export type ResetMode = 'all-data' | 'only-app-db'
 
 export const BootStateProgress = Schema.Struct({
-  done: Schema.Number,
-  total: Schema.Number,
+  done: Schema.Finite,
+  total: Schema.Finite,
 })
 
 /**
@@ -60,7 +58,7 @@ export const BootStateProgress = Schema.Struct({
  * - `storage-unavailable`: OPFS access denied for other reasons (permissions, quota)
  * - `unknown`: Unexpected error during storage initialization
  */
-export const BootWarningReason = Schema.Literal('private-browsing', 'storage-unavailable', 'unknown')
+export const BootWarningReason = Schema.Literals(['private-browsing', 'storage-unavailable', 'unknown'])
 export type BootWarningReason = typeof BootWarningReason.Type
 
 /**
@@ -70,10 +68,10 @@ export type BootWarningReason = typeof BootWarningReason.Type
  * - `persisted`: Data is persisted to disk (e.g., via OPFS)
  * - `in-memory`: Data is only stored in memory and will be lost on page refresh
  */
-export const StorageMode = Schema.Literal('persisted', 'in-memory')
+export const StorageMode = Schema.Literals(['persisted', 'in-memory'])
 export type StorageMode = typeof StorageMode.Type
 
-export const BootStatus = Schema.Union(
+export const BootStatus = Schema.Union([
   Schema.Struct({ stage: Schema.Literal('loading') }),
   Schema.Struct({ stage: Schema.Literal('migrating'), progress: BootStateProgress }),
   Schema.Struct({ stage: Schema.Literal('rehydrating'), progress: BootStateProgress }),
@@ -88,67 +86,35 @@ export const BootStatus = Schema.Union(
     reason: BootWarningReason,
     message: Schema.String,
   }),
-).annotations({ title: 'BootStatus' })
+]).annotate({ title: 'BootStatus' })
 
 export type BootStatus = typeof BootStatus.Type
 
-/**
- * Can be used in queries to refer to the current session id.
- * Will be replaced with the actual session id at runtime
- *
- * In client document table:
- * ```ts
- * const uiState = State.SQLite.clientDocument({
- *   name: 'ui_state',
- *   schema: Schema.Struct({
- *     theme: Schema.Literal('dark', 'light', 'system'),
- *     user: Schema.String,
- *     showToolbar: Schema.Boolean,
- *   }),
- *   default: { value: defaultFrontendState, id: SessionIdSymbol },
- * })
- * ```
- *
- * Or in a client document query:
- * ```ts
- * const query$ = queryDb(tables.uiState.get(SessionIdSymbol))
- * ```
- */
-export const SessionIdSymbol = Symbol.for('@livestore/session-id')
-export type SessionIdSymbol = typeof SessionIdSymbol
-
 export type LockStatus = 'has-lock' | 'no-lock'
 
-// TODO possibly allow a combination of these options
 // TODO allow a way to stream the migration progress back to the app
-export type MigrationOptions =
-  | {
-      strategy: 'auto'
-      hooks?: Partial<MigrationHooks>
-      logging?: {
-        excludeAffectedRows?: (sqlStmt: string) => boolean
-      }
-    }
-  | {
-      strategy: 'manual'
-      migrate: (
-        oldDb: Uint8Array<ArrayBuffer>,
-      ) => Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>> | Effect.Effect<Uint8Array<ArrayBuffer>, unknown>
-    }
+export type MigrationOptions = {
+  hooks?: Partial<MigrationHooks>
+  logging?: {
+    excludeAffectedRows?: (sqlStmt: string) => boolean
+  }
+}
 
 export type MigrationHooks = {
   /** Runs on the empty in-memory database with no database schemas applied yet */
   init: MigrationHook
-  /** Runs before applying the migration strategy but after table schemas have been applied and singleton rows have been created */
+  /** Runs after table schemas and singleton rows are created, but before rematerializing state from the eventlog */
   pre: MigrationHook
-  /** Runs after applying the migration strategy before creating export snapshot and closing the database */
+  /** Runs after rematerializing state from the eventlog */
   post: MigrationHook
 }
 
 export type MigrationHook = (db: SqliteDb) => void | Promise<void> | Effect.Effect<void, unknown>
 
-export interface ClientSessionDevtoolsChannel
-  extends WebChannel.WebChannel<Devtools.ClientSession.MessageToApp, Devtools.ClientSession.MessageFromApp> {}
+export interface ClientSessionDevtoolsChannel extends WebChannel.WebChannel<
+  Devtools.ClientSession.MessageToApp,
+  Devtools.ClientSession.MessageFromApp
+> {}
 
 export type ConnectDevtoolsToStore = (
   storeDevtoolsChannel: ClientSessionDevtoolsChannel,
@@ -163,10 +129,7 @@ export interface AdapterArgs {
   debugInstanceId: string
   bootStatusQueue: Queue.Queue<BootStatus>
   shutdown: (
-    exit: Exit.Exit<
-      IntentionalShutdownCause,
-      UnknownError | MaterializeError | BackendIdMismatchError
-    >,
+    exit: Exit.Exit<IntentionalShutdownCause, UnknownError | MaterializeError | BackendIdMismatchError>,
   ) => Effect.Effect<void>
   connectDevtoolsToStore: ConnectDevtoolsToStore
   /**
@@ -174,7 +137,7 @@ export interface AdapterArgs {
    *
    * @default undefined
    */
-  syncPayloadSchema: Schema.Schema<any> | undefined
+  syncPayloadSchema: Schema.Decoder<Schema.Json> | undefined
   /** Encoded representation of the sync payload matching `syncPayloadSchema`. */
-  syncPayloadEncoded: Schema.JsonValue | undefined
+  syncPayloadEncoded: Schema.Json | undefined
 }