@livestore/livestore 0.4.0-dev.2 → 0.4.0-dev.20

package/src/store/store.ts

@@ -1,26 +1,25 @@
 import {
   type Bindable,
   type ClientSession,
-  type ClientSessionSyncProcessor,
   Devtools,
-  getDurationMsFromSpan,
   getExecStatementsFromMaterializer,
   getResultSchema,
   hashMaterializerResults,
   IntentionalShutdownCause,
   isQueryBuilder,
   liveStoreVersion,
+  MaterializeError,
+  MaterializerHashMismatchError,
   makeClientSessionSyncProcessor,
   type PreparedBindValues,
   prepareBindValues,
-  type QueryBuilder,
   QueryBuilderAstSymbol,
   replaceSessionIdSymbol,
-  UnexpectedError,
+  UnknownError,
 } from '@livestore/common'
 import type { LiveStoreSchema } from '@livestore/common/schema'
-import { getEventDef, LiveStoreEvent, SystemTables } from '@livestore/common/schema'
-import { assertNever, isDevEnv, notYetImplemented } from '@livestore/utils'
+import { LiveStoreEvent, resolveEventDef, SystemTables } from '@livestore/common/schema'
+import { assertNever, isDevEnv, notYetImplemented, omitUndefineds, shouldNeverHappen } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
 import {
   Cause,
@@ -37,13 +36,7 @@ import {
 import { nanoid } from '@livestore/utils/nanoid'
 import * as otel from '@opentelemetry/api'
 
-import type {
-  LiveQuery,
-  LiveQueryDef,
-  ReactivityGraph,
-  ReactivityGraphContext,
-  SignalDef,
-} from '../live-queries/base-class.ts'
+import type { LiveQuery, ReactivityGraphContext, SignalDef } from '../live-queries/base-class.ts'
 import { makeReactivityGraph } from '../live-queries/base-class.ts'
 import { makeExecBeforeFirstRun } from '../live-queries/client-document-get-query.ts'
 import { queryDb } from '../live-queries/db-query.ts'
@@ -51,50 +44,109 @@ import type { Ref } from '../reactive.ts'
 import { SqliteDbWrapper } from '../SqliteDbWrapper.ts'
 import { ReferenceCountedSet } from '../utils/data-structures.ts'
 import { downloadBlob, exposeDebugUtils } from '../utils/dev.ts'
-import type { StackInfo } from '../utils/stack-info.ts'
-import type {
-  RefreshReason,
-  StoreCommitOptions,
-  StoreEventsOptions,
-  StoreOptions,
-  StoreOtel,
-  Unsubscribe,
+import {
+  type Queryable,
+  type RefreshReason,
+  type StoreCommitOptions,
+  type StoreEventsOptions,
+  type StoreInternals,
+  StoreInternalsSymbol,
+  type StoreOptions,
+  type StoreOtel,
+  type SubscribeOptions,
+  type Unsubscribe,
 } from './store-types.ts'
 
+export type SubscribeFn = {
+  <TResult>(
+    query: Queryable<TResult>,
+    onUpdate: (value: TResult) => void,
+    options?: SubscribeOptions<TResult>,
+  ): Unsubscribe
+  <TResult>(query: Queryable<TResult>, options?: SubscribeOptions<TResult>): AsyncIterable<TResult>
+}
+
 if (isDevEnv()) {
   exposeDebugUtils()
 }
 
+/**
+ * Central interface to a LiveStore database providing reactive queries, event commits, and sync.
+ *
+ * A `Store` instance wraps a local SQLite database that is kept in sync with other clients via
+ * an event log. Instead of mutating state directly, you commit events that get materialized
+ * into database rows. Queries automatically re-run when their underlying tables change.
+ *
+ * ## Creating a Store
+ *
+ * Use `createStore` (Effect-based) or `createStorePromise` to obtain a Store instance.
+ * In React applications, use the `<LiveStoreProvider>` component which manages the Store lifecycle
+ * and exposes it via React context.
+ *
+ * ## Querying Data
+ *
+ * Use {@link Store.query} for one-shot reads or {@link Store.subscribe} for reactive subscriptions.
+ * Both accept query builders (e.g. `tables.todo.where({ complete: true })`) or custom `LiveQueryDef`s.
+ *
+ * ## Committing Events
+ *
+ * Use {@link Store.commit} to persist events. Events are immediately materialized locally and
+ * asynchronously synced to other clients. Multiple events can be committed atomically.
+ *
+ * ## Lifecycle
+ *
+ * The Store must be shut down when no longer needed via {@link Store.shutdown} or
+ * {@link Store.shutdownPromise}. Framework integrations (React, Effect) handle this automatically.
+ *
+ * @typeParam TSchema - The LiveStore schema defining tables and events
+ * @typeParam TContext - Optional user-defined context attached to the Store (e.g. for dependency injection)
+ *
+ * @example
+ * ```ts
+ * // Query data
+ * const todos = store.query(tables.todo.where({ complete: false }))
+ *
+ * // Subscribe to changes
+ * const unsubscribe = store.subscribe(tables.todo.all(), (todos) => {
+ *   console.log('Todos updated:', todos)
+ * })
+ *
+ * // Commit an event
+ * store.commit(events.todoCreated({ id: nanoid(), text: 'Buy milk' }))
+ * ```
+ */
 export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TContext = {}> extends Inspectable.Class {
+  /** Unique identifier for this Store instance, stable for its lifetime. */
   readonly storeId: string
-  reactivityGraph: ReactivityGraph
-  sqliteDbWrapper: SqliteDbWrapper
-  clientSession: ClientSession
-  schema: LiveStoreSchema
-  context: TContext
-  otel: StoreOtel
-  /**
-   * Note we're using `Ref<null>` here as we don't care about the value but only about *that* something has changed.
-   * This only works in combination with `equal: () => false` which will always trigger a refresh.
-   */
-  tableRefs: { [key: string]: Ref<null, ReactivityGraphContext, RefreshReason> }
-
-  /** Tracks whether the store has been shut down */
-  private isShutdown = false
-
-  private effectContext: {
-    runtime: Runtime.Runtime<Scope.Scope>
-    lifetimeScope: Scope.Scope
-  }
 
-  /** RC-based set to see which queries are currently subscribed to */
-  activeQueries: ReferenceCountedSet<LiveQuery<any>>
+  /** The LiveStore schema defining tables, events, and materializers. */
+  readonly schema: LiveStoreSchema
 
-  // NOTE this is currently exposed for the Devtools databrowser to commit events
-  readonly __eventSchema
-  readonly syncProcessor: ClientSessionSyncProcessor
+  /** User-defined context attached to this Store (e.g. for dependency injection). */
+  readonly context: TContext
+  /**
+   * Reactive connectivity updates emitted by the backing sync backend.
+   *
+   * @example
+   * ```ts
+   * import { Effect, Stream } from 'effect'
+   *
+   * const status = await store.networkStatus.pipe(Effect.runPromise)
+   *
+   * await store.networkStatus.changes.pipe(
+   *   Stream.tap((next) => console.log('network status update', next)),
+   *   Stream.runDrain,
+   *   Effect.scoped,
+   *   Effect.runPromise,
+   * )
+   * ```
+   */
+  readonly networkStatus: ClientSession['leaderThread']['networkStatus']
 
-  readonly boot: Effect.Effect<void, UnexpectedError, Scope.Scope>
+  /**
+   * Store internals. Not part of the public API — shapes and semantics may change without notice.
+   */
+  readonly [StoreInternalsSymbol]: StoreInternals
 
   // #region constructor
   constructor({
@@ -112,95 +164,112 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
     super()
 
     this.storeId = storeId
-
-    this.sqliteDbWrapper = new SqliteDbWrapper({ otel: otelOptions, db: clientSession.sqliteDb })
-    this.clientSession = clientSession
     this.schema = schema
     this.context = context
 
-    this.effectContext = effectContext
-
     const reactivityGraph = makeReactivityGraph()
 
     const syncSpan = otelOptions.tracer.startSpan('LiveStore:sync', {}, otelOptions.rootSpanContext)
 
-    this.syncProcessor = makeClientSessionSyncProcessor({
+    const syncProcessor = makeClientSessionSyncProcessor({
       schema,
       clientSession,
       runtime: effectContext.runtime,
-      materializeEvent: (eventDecoded, { otelContext, withChangeset, materializerHashLeader }) => {
-        const { eventDef, materializer } = getEventDef(schema, eventDecoded.name)
-
-        const execArgsArr = getExecStatementsFromMaterializer({
-          eventDef,
-          materializer,
-          dbState: this.sqliteDbWrapper,
-          event: { decoded: eventDecoded, encoded: undefined },
-        })
-
-        const materializerHash = isDevEnv() ? Option.some(hashMaterializerResults(execArgsArr)) : Option.none()
-
-        if (
-          materializerHashLeader._tag === 'Some' &&
-          materializerHash._tag === 'Some' &&
-          materializerHashLeader.value !== materializerHash.value
-        ) {
-          void this.shutdown(
-            Cause.fail(
-              UnexpectedError.make({
-                cause: `Materializer hash mismatch detected for event "${eventDecoded.name}".`,
-                note: `Please make sure your event materializer is a pure function without side effects.`,
-              }),
-            ),
-          )
-        }
-
-        const writeTablesForEvent = new Set<string>()
-
-        const exec = () => {
-          for (const {
-            statementSql,
-            bindValues,
-            writeTables = this.sqliteDbWrapper.getTablesUsed(statementSql),
-          } of execArgsArr) {
-            try {
-              this.sqliteDbWrapper.cachedExecute(statementSql, bindValues, { otelContext, writeTables })
-            } catch (cause) {
-              throw UnexpectedError.make({
-                cause,
-                note: `Error executing materializer for event "${eventDecoded.name}".\nStatement: ${statementSql}\nBind values: ${JSON.stringify(bindValues)}`,
-              })
+      materializeEvent: Effect.fn('client-session-sync-processor:materialize-event')(
+        (eventEncoded, { withChangeset, materializerHashLeader }) =>
+          // We need to use `Effect.gen` (even though we're using `Effect.fn`) so that we can pass `this` to the function
+          Effect.gen(this, function* () {
+            const resolution = yield* resolveEventDef(schema, {
+              operation: '@livestore/livestore:store:materializeEvent',
+              event: eventEncoded,
+            })
+
+            if (resolution._tag === 'unknown') {
+              // Runtime schema doesn't know this event yet; skip materialization but
+              // keep the log entry so upgraded clients can replay it later.
+              return {
+                writeTables: new Set<string>(),
+                sessionChangeset: { _tag: 'no-op' as const },
+                materializerHash: Option.none(),
+              }
             }
 
-            // durationMsTotal += durationMs
-            for (const table of writeTables) {
-              writeTablesForEvent.add(table)
+            const { eventDef, materializer } = resolution
+
+            const execArgsArr = getExecStatementsFromMaterializer({
+              eventDef,
+              materializer,
+              dbState: this[StoreInternalsSymbol].sqliteDbWrapper,
+              event: { decoded: undefined, encoded: eventEncoded },
+            })
+
+            const materializerHash = isDevEnv() ? Option.some(hashMaterializerResults(execArgsArr)) : Option.none()
+
+            // Hash mismatch detection only occurs during the pull path (when receiving events from the leader).
+            // During push path (local commits), materializerHashLeader is always Option.none(), so this condition
+            // will never be met. The check happens when the same event comes back from the leader during sync,
+            // allowing us to compare the leader's computed hash with our local re-materialization hash.
+            if (
+              materializerHashLeader._tag === 'Some' &&
+              materializerHash._tag === 'Some' &&
+              materializerHashLeader.value !== materializerHash.value
+            ) {
+              return yield* MaterializerHashMismatchError.make({ eventName: eventEncoded.name })
             }
 
-            this.sqliteDbWrapper.debug.head = eventDecoded.seqNum
-          }
-        }
-
-        let sessionChangeset:
-          | { _tag: 'sessionChangeset'; data: Uint8Array<ArrayBuffer>; debug: any }
-          | { _tag: 'no-op' }
-          | { _tag: 'unset' } = { _tag: 'unset' }
+            const span = yield* OtelTracer.currentOtelSpan.pipe(Effect.orDie)
+            const otelContext = otel.trace.setSpan(otel.context.active(), span)
+
+            const writeTablesForEvent = new Set<string>()
+
+            const exec = () => {
+              for (const {
+                statementSql,
+                bindValues,
+                writeTables = this[StoreInternalsSymbol].sqliteDbWrapper.getTablesUsed(statementSql),
+              } of execArgsArr) {
+                try {
+                  this[StoreInternalsSymbol].sqliteDbWrapper.cachedExecute(statementSql, bindValues, {
+                    otelContext,
+                    writeTables,
+                  })
+                } catch (cause) {
+                  // TOOD refactor with `SqliteError`
+                  throw UnknownError.make({
+                    cause,
+                    note: `Error executing materializer for event "${eventEncoded.name}".\nStatement: ${statementSql}\nBind values: ${JSON.stringify(bindValues)}`,
+                  })
+                }
+
+                // durationMsTotal += durationMs
+                for (const table of writeTables) {
+                  writeTablesForEvent.add(table)
+                }
+
+                this[StoreInternalsSymbol].sqliteDbWrapper.debug.head = eventEncoded.seqNum
+              }
+            }
 
-        if (withChangeset === true) {
-          sessionChangeset = this.sqliteDbWrapper.withChangeset(exec).changeset
-        } else {
-          exec()
-        }
+            let sessionChangeset:
+              | { _tag: 'sessionChangeset'; data: Uint8Array<ArrayBuffer>; debug: any }
+              | { _tag: 'no-op' }
+              | { _tag: 'unset' } = { _tag: 'unset' }
+            if (withChangeset === true) {
+              sessionChangeset = this[StoreInternalsSymbol].sqliteDbWrapper.withChangeset(exec).changeset
+            } else {
+              exec()
+            }
 
-        return { writeTables: writeTablesForEvent, sessionChangeset, materializerHash }
-      },
+            return { writeTables: writeTablesForEvent, sessionChangeset, materializerHash }
+          }).pipe(Effect.mapError((cause) => MaterializeError.make({ cause }))),
+      ),
       rollback: (changeset) => {
-        this.sqliteDbWrapper.rollback(changeset)
+        this[StoreInternalsSymbol].sqliteDbWrapper.rollback(changeset)
       },
       refreshTables: (tables) => {
         const tablesToUpdate = [] as [Ref<null, ReactivityGraphContext, RefreshReason>, null][]
         for (const tableName of tables) {
-          const tableRef = this.tableRefs[tableName]
+          const tableRef = this[StoreInternalsSymbol].tableRefs[tableName]
           assertNever(tableRef !== undefined, `No table ref found for ${tableName}`)
           tablesToUpdate.push([tableRef!, null])
         }
@@ -208,17 +277,19 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
       },
       span: syncSpan,
       params: {
-        leaderPushBatchSize: params.leaderPushBatchSize,
-        simulation: params.simulation?.clientSessionSyncProcessor,
+        ...omitUndefineds({
+          leaderPushBatchSize: params.leaderPushBatchSize,
+        }),
+        ...(params.simulation?.clientSessionSyncProcessor !== undefined
+          ? { simulation: params.simulation.clientSessionSyncProcessor }
+          : {}),
       },
       confirmUnsavedChanges,
     })
 
-    this.__eventSchema = LiveStoreEvent.makeEventDefSchemaMemo(schema)
-
     // TODO generalize the `tableRefs` concept to allow finer-grained refs
-    this.tableRefs = {}
-    this.activeQueries = new ReferenceCountedSet()
+    const tableRefs: { [key: string]: Ref<null, ReactivityGraphContext, RefreshReason> } = {}
+    const activeQueries = new ReferenceCountedSet<LiveQuery<any>>()
 
     const commitsSpan = otelOptions.tracer.startSpan('LiveStore:commits', {}, otelOptions.rootSpanContext)
     const otelMuationsSpanContext = otel.trace.setSpan(otel.context.active(), commitsSpan)
@@ -226,8 +297,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
     const queriesSpan = otelOptions.tracer.startSpan('LiveStore:queries', {}, otelOptions.rootSpanContext)
     const otelQueriesSpanContext = otel.trace.setSpan(otel.context.active(), queriesSpan)
 
-    this.reactivityGraph = reactivityGraph
-    this.reactivityGraph.context = {
+    reactivityGraph.context = {
       store: this as unknown as Store<LiveStoreSchema>,
       defRcMap: new Map(),
       reactivityGraph: new WeakRef(reactivityGraph),
@@ -235,8 +305,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
       rootOtelContext: otelQueriesSpanContext,
       effectsWrapper: batchUpdates,
     }
-
-    this.otel = {
+    const otelObj: StoreOtel = {
       tracer: otelOptions.tracer,
       rootSpanContext: otelOptions.rootSpanContext,
       commitsSpanContext: otelMuationsSpanContext,
@@ -252,27 +321,27 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
         : Array.from(this.schema.state.sqlite.tables.keys()).filter((_) => !SystemTables.isStateSystemTable(_)),
     )
     const existingTableRefs = new Map(
-      Array.from(this.reactivityGraph.atoms.values())
+      Array.from(reactivityGraph.atoms.values())
         .filter((_): _ is Ref<any, any, any> => _._tag === 'ref' && _.label?.startsWith('tableRef:') === true)
         .map((_) => [_.label!.slice('tableRef:'.length), _] as const),
     )
     for (const tableName of allTableNames) {
-      this.tableRefs[tableName] =
+      tableRefs[tableName] =
         existingTableRefs.get(tableName) ??
-        this.reactivityGraph.makeRef(null, {
+        reactivityGraph.makeRef(null, {
           equal: () => false,
           label: `tableRef:${tableName}`,
           meta: { liveStoreRefType: 'table' },
         })
     }
 
-    this.boot = Effect.gen(this, function* () {
+    const boot = Effect.gen(this, function* () {
       yield* Effect.addFinalizer(() =>
         Effect.sync(() => {
           // Remove all table refs from the reactivity graph
-          for (const tableRef of Object.values(this.tableRefs)) {
+          for (const tableRef of Object.values(tableRefs)) {
             for (const superComp of tableRef.super) {
-              this.reactivityGraph.removeEdge(superComp, tableRef)
+              this[StoreInternalsSymbol].reactivityGraph.removeEdge(superComp, tableRef)
             }
           }
 
@@ -283,22 +352,58 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
         }),
       )
 
-      yield* this.syncProcessor.boot
+      yield* syncProcessor.boot
     })
+
+    // Build Sqlite wrapper last to avoid using getters before internals are set
+    const sqliteDbWrapper = new SqliteDbWrapper({ otel: otelOptions, db: clientSession.sqliteDb })
+
+    // Initialize internals bag
+    this[StoreInternalsSymbol] = {
+      eventSchema: LiveStoreEvent.Client.makeSchemaMemo(schema) as Schema.Schema<
+        LiveStoreEvent.Client.Decoded,
+        LiveStoreEvent.Client.Encoded
+      >,
+      clientSession,
+      sqliteDbWrapper,
+      effectContext,
+      otel: otelObj,
+      reactivityGraph,
+      tableRefs,
+      activeQueries,
+      syncProcessor,
+      boot,
+      isShutdown: false,
+    }
+
+    // Initialize stable network status property from client session
+    this.networkStatus = clientSession.leaderThread.networkStatus
   }
   // #endregion constructor
 
+  /**
+   * Current session identifier for this Store instance.
+   *
+   * - Stable for the lifetime of the Store
+   * - Useful for correlating events or scoping per-session data
+   */
   get sessionId(): string {
-    return this.clientSession.sessionId
+    return this[StoreInternalsSymbol].clientSession.sessionId
   }
 
+  /**
+   * Stable client identifier for the process/device using this Store.
+   *
+   * - Shared across Store instances created by the same client
+   * - Useful for diagnostics and multi-client correlation
+   */
   get clientId(): string {
-    return this.clientSession.clientId
+    return this[StoreInternalsSymbol].clientSession.clientId
   }
 
   private checkShutdown = (operation: string): void => {
-    if (this.isShutdown) {
-      throw new UnexpectedError({
+    if (this[StoreInternalsSymbol].isShutdown) {
+      throw new UnknownError({
         cause: `Store has been shut down (while performing "${operation}").`,
         note: `You cannot perform this operation after the store has been shut down.`,
       })
@@ -306,47 +411,53 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
   }
 
   /**
-   * Subscribe to the results of a query
-   * Returns a function to cancel the subscription.
+   * Subscribe to the results of a query.
+   *
+   * - When providing an `onUpdate` callback it returns an {@link Unsubscribe} function.
+   * - Without a callback it returns an {@link AsyncIterable} that yields query results.
+   *
+   * @example
+   * ```ts
+   * const unsubscribe = store.subscribe(query$, (result) => console.log(result))
+   * ```
    *
    * @example
    * ```ts
-   * const unsubscribe = store.subscribe(query$, { onUpdate: (result) => console.log(result) })
+   * for await (const result of store.subscribe(query$)) {
+   *   console.log(result)
+   * }
    * ```
    */
-  subscribe = <TResult>(
-    query: LiveQueryDef<TResult, 'def' | 'signal-def'> | LiveQuery<TResult> | QueryBuilder<TResult, any, any>,
-    options: {
-      /** Called when the query result has changed */
-      onUpdate: (value: TResult) => void
-      onSubscribe?: (query$: LiveQuery<TResult>) => void
-      /** Gets called after the query subscription has been removed */
-      onUnsubsubscribe?: () => void
-      label?: string
-      /**
-       * Skips the initial `onUpdate` callback
-       * @default false
-       */
-      skipInitialRun?: boolean
-      otelContext?: otel.Context
-      /** If provided, the stack info will be added to the `activeSubscriptions` set of the query */
-      stackInfo?: StackInfo
-    },
+  subscribe = (<TResult>(
+    query: Queryable<TResult>,
+    onUpdateOrOptions?: ((value: TResult) => void) | SubscribeOptions<TResult>,
+    maybeOptions?: SubscribeOptions<TResult>,
+  ): Unsubscribe | AsyncIterable<TResult> => {
+    if (typeof onUpdateOrOptions === 'function') {
+      return this.subscribeWithCallback(query, onUpdateOrOptions, maybeOptions)
+    }
+
+    return this.subscribeAsAsyncIterable(query, onUpdateOrOptions)
+  }) as SubscribeFn
+
+  private subscribeWithCallback = <TResult>(
+    query: Queryable<TResult>,
+    onUpdate: (value: TResult) => void,
+    options?: SubscribeOptions<TResult>,
   ): Unsubscribe => {
     this.checkShutdown('subscribe')
 
-    return this.otel.tracer.startActiveSpan(
+    return this[StoreInternalsSymbol].otel.tracer.startActiveSpan(
       `LiveStore.subscribe`,
       { attributes: { label: options?.label, queryLabel: isQueryBuilder(query) ? query.toString() : query.label } },
-      options?.otelContext ?? this.otel.queriesSpanContext,
+      options?.otelContext ?? this[StoreInternalsSymbol].otel.queriesSpanContext,
       (span) => {
-        // console.debug('store sub', query$.id, query$.label)
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
         const queryRcRef = isQueryBuilder(query)
-          ? queryDb(query).make(this.reactivityGraph.context!)
+          ? queryDb(query).make(this[StoreInternalsSymbol].reactivityGraph.context!)
           : query._tag === 'def' || query._tag === 'signal-def'
-            ? query.make(this.reactivityGraph.context!)
+            ? query.make(this[StoreInternalsSymbol].reactivityGraph.context!)
             : {
                 value: query as LiveQuery<TResult>,
                 deref: () => {},
@@ -354,11 +465,23 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
         const query$ = queryRcRef.value
 
         const label = `subscribe:${options?.label}`
-        const effect = this.reactivityGraph.makeEffect(
-          (get, _otelContext, debugRefreshReason) =>
-            options.onUpdate(get(query$.results$, otelContext, debugRefreshReason)),
+        let suppressCallback = options?.skipInitialRun === true
+        const effect = this[StoreInternalsSymbol].reactivityGraph.makeEffect(
+          (get, _otelContext, debugRefreshReason) => {
+            const result = get(query$.results$, otelContext, debugRefreshReason)
+            if (suppressCallback) {
+              return
+            }
+            onUpdate(result)
+          },
           { label },
         )
+        const runInitialEffect = () => {
+          effect.doEffect(otelContext, {
+            _tag: 'subscribe.initial',
+            label: `subscribe-initial-run:${options?.label}`,
+          })
+        }
 
         if (options?.stackInfo) {
           query$.activeSubscriptions.add(options.stackInfo)
@@ -366,18 +489,23 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
 
         options?.onSubscribe?.(query$)
 
-        this.activeQueries.add(query$ as LiveQuery<TResult>)
+        this[StoreInternalsSymbol].activeQueries.add(query$ as LiveQuery<TResult>)
 
-        // Running effect right away to get initial value (unless `skipInitialRun` is set)
-        if (options?.skipInitialRun !== true && !query$.isDestroyed) {
-          effect.doEffect(otelContext, { _tag: 'subscribe.initial', label: `subscribe-initial-run:${options?.label}` })
+        if (!query$.isDestroyed) {
+          if (suppressCallback) {
+            // We still run once to register dependencies in the reactive graph, but suppress the initial callback so the
+            // caller truly skips the first emission; subsequent runs (after commits) will call the callback.
+            runInitialEffect()
+            suppressCallback = false
+          } else {
+            runInitialEffect()
+          }
         }
 
         const unsubscribe = () => {
-          // console.debug('store unsub', query$.id, query$.label)
           try {
-            this.reactivityGraph.destroyNode(effect)
-            this.activeQueries.remove(query$ as LiveQuery<TResult>)
+            this[StoreInternalsSymbol].reactivityGraph.destroyNode(effect)
+            this[StoreInternalsSymbol].activeQueries.remove(query$ as LiveQuery<TResult>)
 
             if (options?.stackInfo) {
               query$.activeSubscriptions.delete(options.stackInfo)
@@ -396,10 +524,16 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
     )
   }
 
-  subscribeStream = <TResult>(
-    query$: LiveQueryDef<TResult>,
-    options?: { label?: string; skipInitialRun?: boolean } | undefined,
-  ): Stream.Stream<TResult> =>
+  private subscribeAsAsyncIterable = <TResult>(
+    query: Queryable<TResult>,
+    options?: SubscribeOptions<TResult>,
+  ): AsyncIterable<TResult> => {
+    this.checkShutdown('subscribe')
+
+    return Stream.toAsyncIterable(this.subscribeStream(query, options))
+  }
+
+  subscribeStream = <TResult>(query: Queryable<TResult>, options?: SubscribeOptions<TResult>): Stream.Stream<TResult> =>
     Stream.asyncPush<TResult>((emit) =>
       Effect.gen(this, function* () {
         const otelSpan = yield* OtelTracer.currentOtelSpan.pipe(
@@ -409,10 +543,9 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
 
         yield* Effect.acquireRelease(
           Effect.sync(() =>
-            this.subscribe(query$, {
-              onUpdate: (result) => emit.single(result),
+            this.subscribe(query, (result) => emit.single(result), {
+              ...(options ?? {}),
               otelContext,
-              label: options?.label,
             }),
           ),
           (unsub) => Effect.sync(() => unsub()),
@@ -435,20 +568,19 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
    * ```
    */
   query = <TResult>(
-    query:
-      | QueryBuilder<TResult, any, any>
-      | LiveQuery<TResult>
-      | LiveQueryDef<TResult>
-      | SignalDef<TResult>
-      | { query: string; bindValues: Bindable; schema?: Schema.Schema<TResult> },
+    query: Queryable<TResult> | { query: string; bindValues: Bindable; schema?: Schema.Schema<TResult> },
     options?: { otelContext?: otel.Context; debugRefreshReason?: RefreshReason },
   ): TResult => {
     this.checkShutdown('query')
 
     if (typeof query === 'object' && 'query' in query && 'bindValues' in query) {
-      const res = this.sqliteDbWrapper.cachedSelect(query.query, prepareBindValues(query.bindValues, query.query), {
-        otelContext: options?.otelContext,
-      }) as any
+      const res = this[StoreInternalsSymbol].sqliteDbWrapper.cachedSelect(
+        query.query,
+        prepareBindValues(query.bindValues, query.query),
+        {
+          ...omitUndefineds({ otelContext: options?.otelContext }),
+        },
+      ) as any
       if (query.schema) {
         return Schema.decodeSync(query.schema)(res)
       }
@@ -461,7 +593,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
           id: ast.id,
           explicitDefaultValues: ast.explicitDefaultValues,
           otelContext: options?.otelContext,
-        })(this.reactivityGraph.context!)
+        })(this[StoreInternalsSymbol].reactivityGraph.context!)
       }
 
       const sqlRes = query.asSql()
@@ -469,25 +601,43 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
 
       // Replace SessionIdSymbol in bind values before executing the query
       if (sqlRes.bindValues) {
-        replaceSessionIdSymbol(sqlRes.bindValues, this.clientSession.sessionId)
+        replaceSessionIdSymbol(sqlRes.bindValues, this[StoreInternalsSymbol].clientSession.sessionId)
       }
 
-      const rawRes = this.sqliteDbWrapper.cachedSelect(sqlRes.query, sqlRes.bindValues as any as PreparedBindValues, {
-        otelContext: options?.otelContext,
-        queriedTables: new Set([query[QueryBuilderAstSymbol].tableDef.sqliteDef.name]),
-      })
+      const rawRes = this[StoreInternalsSymbol].sqliteDbWrapper.cachedSelect(
+        sqlRes.query,
+        sqlRes.bindValues as any as PreparedBindValues,
+        {
+          ...omitUndefineds({ otelContext: options?.otelContext }),
+          queriedTables: new Set([query[QueryBuilderAstSymbol].tableDef.sqliteDef.name]),
+        },
+      )
 
-      return Schema.decodeSync(schema)(rawRes)
+      const decodeResult = Schema.decodeEither(schema)(rawRes)
+      if (decodeResult._tag === 'Right') {
+        return decodeResult.right
+      } else {
+        return shouldNeverHappen(
+          `Failed to decode query result with for schema:`,
+          schema.toString(),
+          'raw result:',
+          rawRes,
+          'decode error:',
+          decodeResult.left,
+        )
+      }
     } else if (query._tag === 'def') {
-      const query$ = query.make(this.reactivityGraph.context!)
+      const query$ = query.make(this[StoreInternalsSymbol].reactivityGraph.context!)
       const result = this.query(query$.value, options)
       query$.deref()
       return result
     } else if (query._tag === 'signal-def') {
-      const signal$ = query.make(this.reactivityGraph.context!)
+      const signal$ = query.make(this[StoreInternalsSymbol].reactivityGraph.context!)
       return signal$.value.get()
     } else {
-      return query.run({ otelContext: options?.otelContext, debugRefreshReason: options?.debugRefreshReason })
+      return query.run({
+        ...omitUndefineds({ otelContext: options?.otelContext, debugRefreshReason: options?.debugRefreshReason }),
+      })
     }
   }
 
@@ -509,7 +659,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
   setSignal = <T>(signalDef: SignalDef<T>, value: T | ((prev: T) => T)): void => {
     this.checkShutdown('setSignal')
 
-    const signalRef = signalDef.make(this.reactivityGraph.context!)
+    const signalRef = signalDef.make(this[StoreInternalsSymbol].reactivityGraph.context!)
     const newValue: T = typeof value === 'function' ? (value as any)(signalRef.value.get()) : value
     signalRef.value.set(newValue)
 
@@ -576,19 +726,19 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
    * ```
    */
   commit: {
-    <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(...list: TCommitArg): void
+    <const TCommitArg extends ReadonlyArray<LiveStoreEvent.Input.ForSchema<TSchema>>>(...list: TCommitArg): void
     (
-      txn: <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(
+      txn: <const TCommitArg extends ReadonlyArray<LiveStoreEvent.Input.ForSchema<TSchema>>>(
         ...list: TCommitArg
       ) => void,
     ): void
-    <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(
+    <const TCommitArg extends ReadonlyArray<LiveStoreEvent.Input.ForSchema<TSchema>>>(
       options: StoreCommitOptions,
       ...list: TCommitArg
     ): void
     (
       options: StoreCommitOptions,
-      txn: <const TCommitArg extends ReadonlyArray<LiveStoreEvent.PartialForSchema<TSchema>>>(
+      txn: <const TCommitArg extends ReadonlyArray<LiveStoreEvent.Input.ForSchema<TSchema>>>(
         ...list: TCommitArg
       ) => void,
     ): void
@@ -597,84 +747,78 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
 
     const { events, options } = this.getCommitArgs(firstEventOrTxnFnOrOptions, restEvents)
 
-    for (const event of events) {
-      replaceSessionIdSymbol(event.args, this.clientSession.sessionId)
-    }
-
-    if (events.length === 0) return
-
-    const skipRefresh = options?.skipRefresh ?? false
+    Effect.gen(this, function* () {
+      const commitsSpan = otel.trace.getSpan(this[StoreInternalsSymbol].otel.commitsSpanContext)
+      commitsSpan?.addEvent('commit')
+      const currentSpan = yield* OtelTracer.currentOtelSpan.pipe(Effect.orDie)
+      commitsSpan?.addLink({ context: currentSpan.spanContext() })
 
-    const commitsSpan = otel.trace.getSpan(this.otel.commitsSpanContext)!
-    commitsSpan.addEvent('commit')
-
-    // console.group('LiveStore.commit', { skipRefresh })
-    // events.forEach((_) => console.debug(_.name, _.args))
-    // console.groupEnd()
-
-    let durationMs: number
-
-    return this.otel.tracer.startActiveSpan(
-      'LiveStore:commit',
-      {
-        attributes: {
-          'livestore.eventsCount': events.length,
-          'livestore.eventTags': events.map((_) => _.name),
-          'livestore.commitLabel': options?.label,
-        },
-        links: options?.spanLinks,
-      },
-      options?.otelContext ?? this.otel.commitsSpanContext,
-      (span) => {
-        const otelContext = otel.trace.setSpan(otel.context.active(), span)
+      for (const event of events) {
+        replaceSessionIdSymbol(event.args, this[StoreInternalsSymbol].clientSession.sessionId)
+      }
 
-        try {
-          // Materialize events to state
-          const { writeTables } = (() => {
-            try {
-              const materializeEvents = () => this.syncProcessor.push(events, { otelContext })
+      if (events.length === 0) return
 
-              if (events.length > 1) {
-                return this.sqliteDbWrapper.txn(materializeEvents)
-              } else {
-                return materializeEvents()
-              }
-            } catch (e: any) {
-              console.error(e)
-              span.setStatus({ code: otel.SpanStatusCode.ERROR, message: e.toString() })
-              throw e
-            } finally {
-              span.end()
-            }
-          })()
+      const localRuntime = yield* Effect.runtime()
 
-          const tablesToUpdate = [] as [Ref<null, ReactivityGraphContext, RefreshReason>, null][]
-          for (const tableName of writeTables) {
-            const tableRef = this.tableRefs[tableName]
-            assertNever(tableRef !== undefined, `No table ref found for ${tableName}`)
-            tablesToUpdate.push([tableRef!, null])
+      const materializeEventsTx = Effect.try({
+        try: () => {
+          const runMaterializeEvents = () => {
+            return this[StoreInternalsSymbol].syncProcessor.push(events).pipe(Runtime.runSync(localRuntime))
           }
 
-          const debugRefreshReason = {
-            _tag: 'commit' as const,
-            events,
-            writeTables: Array.from(writeTables),
+          if (events.length > 1) {
+            return this[StoreInternalsSymbol].sqliteDbWrapper.txn(runMaterializeEvents)
+          } else {
+            return runMaterializeEvents()
           }
+        },
+        catch: (cause) => UnknownError.make({ cause }),
+      })
 
-          // Update all table refs together in a batch, to only trigger one reactive update
-          this.reactivityGraph.setRefs(tablesToUpdate, { debugRefreshReason, otelContext, skipRefresh })
-        } catch (e: any) {
-          console.error(e)
-          span.setStatus({ code: otel.SpanStatusCode.ERROR, message: e.toString() })
-          throw e
-        } finally {
-          span.end()
+      // Materialize events to state
+      const { writeTables } = yield* materializeEventsTx
 
-          durationMs = getDurationMsFromSpan(span)
-        }
+      const tablesToUpdate: [Ref<null, ReactivityGraphContext, RefreshReason>, null][] = []
+      for (const tableName of writeTables) {
+        const tableRef = this[StoreInternalsSymbol].tableRefs[tableName]
+        assertNever(tableRef !== undefined, `No table ref found for ${tableName}`)
+        tablesToUpdate.push([tableRef!, null])
+      }
 
-        return { durationMs }
-      },
+      const debugRefreshReason: RefreshReason = {
+        _tag: 'commit',
+        events,
+        writeTables: Array.from(writeTables),
+      }
+      const skipRefresh = options?.skipRefresh ?? false
+
+      // Update all table refs together in a batch, to only trigger one reactive update
+      this[StoreInternalsSymbol].reactivityGraph.setRefs(tablesToUpdate, {
+        debugRefreshReason,
+        skipRefresh,
+        otelContext: otel.trace.setSpan(otel.context.active(), currentSpan),
+      })
+    }).pipe(
+      Effect.withSpan('LiveStore:commit', {
+        root: true,
+        attributes: {
+          'livestore.eventsCount': events.length,
+          'livestore.eventTags': events.map((_) => _.name),
+          ...(options?.label && { 'livestore.commitLabel': options.label }),
+        },
+        links: [
+          // Span link to LiveStore:commits
+          OtelTracer.makeSpanLink({
+            context: otel.trace.getSpanContext(this[StoreInternalsSymbol].otel.commitsSpanContext)!,
+          }),
+          // User-provided span links
+          ...(options?.spanLinks?.map(OtelTracer.makeSpanLink) ?? []),
+        ],
+      }),
+      Effect.tapErrorCause(Effect.logError),
+      Effect.catchAllCause((cause) => Effect.fork(this.shutdown(cause))),
+      Runtime.runSync(this[StoreInternalsSymbol].effectContext.runtime),
     )
   }
   // #endregion commit
@@ -697,13 +841,13 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
    * }
    * ```
    */
-  events = (_options?: StoreEventsOptions<TSchema>): AsyncIterable<LiveStoreEvent.ForSchema<TSchema>> => {
+  events = (_options?: StoreEventsOptions<TSchema>): AsyncIterable<LiveStoreEvent.Client.ForSchema<TSchema>> => {
     this.checkShutdown('events')
 
     return notYetImplemented(`store.events() is not yet implemented but planned soon`)
   }
 
-  eventsStream = (_options?: StoreEventsOptions<TSchema>): Stream.Stream<LiveStoreEvent.ForSchema<TSchema>> => {
+  eventsStream = (_options?: StoreEventsOptions<TSchema>): Stream.Stream<LiveStoreEvent.Client.ForSchema<TSchema>> => {
     this.checkShutdown('eventsStream')
 
     return notYetImplemented(`store.eventsStream() is not yet implemented but planned soon`)
@@ -717,13 +861,13 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
     this.checkShutdown('manualRefresh')
 
     const { label } = options ?? {}
-    this.otel.tracer.startActiveSpan(
+    this[StoreInternalsSymbol].otel.tracer.startActiveSpan(
       'LiveStore:manualRefresh',
       { attributes: { 'livestore.manualRefreshLabel': label } },
-      this.otel.commitsSpanContext,
+      this[StoreInternalsSymbol].otel.commitsSpanContext,
       (span) => {
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
-        this.reactivityGraph.runDeferredEffects({ otelContext })
+        this[StoreInternalsSymbol].reactivityGraph.runDeferredEffects({ otelContext })
         span.end()
       },
     )
@@ -734,10 +878,10 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
    *
    * This is called automatically when the store was created using the React or Effect API.
    */
-  shutdownPromise = async (cause?: UnexpectedError) => {
+  shutdownPromise = async (cause?: UnknownError) => {
     this.checkShutdown('shutdownPromise')
 
-    this.isShutdown = true
+    this[StoreInternalsSymbol].isShutdown = true
     await this.shutdown(cause ? Cause.fail(cause) : undefined).pipe(this.runEffectFork, Fiber.join, Effect.runPromise)
   }
 
@@ -746,11 +890,9 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
    *
    * This is called automatically when the store was created using the React or Effect API.
    */
-  shutdown = (cause?: Cause.Cause<UnexpectedError>): Effect.Effect<void> => {
-    this.checkShutdown('shutdown')
-
-    this.isShutdown = true
-    return this.clientSession.shutdown(
+  shutdown = (cause?: Cause.Cause<UnknownError | MaterializeError>): Effect.Effect<void> => {
+    this[StoreInternalsSymbol].isShutdown = true
+    return this[StoreInternalsSymbol].clientSession.shutdown(
       cause ? Exit.failCause(cause) : Exit.succeed(IntentionalShutdownCause.make({ reason: 'manual' })),
     )
   }
@@ -763,30 +905,33 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
   _dev = {
     downloadDb: (source: 'local' | 'leader' = 'local') => {
       Effect.gen(this, function* () {
-        const data = source === 'local' ? this.sqliteDbWrapper.export() : yield* this.clientSession.leaderThread.export
+        const data =
+          source === 'local'
+            ? this[StoreInternalsSymbol].sqliteDbWrapper.export()
+            : yield* this[StoreInternalsSymbol].clientSession.leaderThread.export
         downloadBlob(data, `livestore-${Date.now()}.db`)
       }).pipe(this.runEffectFork)
     },
 
     downloadEventlogDb: () => {
       Effect.gen(this, function* () {
-        const data = yield* this.clientSession.leaderThread.getEventlogData
+        const data = yield* this[StoreInternalsSymbol].clientSession.leaderThread.getEventlogData
         downloadBlob(data, `livestore-eventlog-${Date.now()}.db`)
       }).pipe(this.runEffectFork)
     },
 
     hardReset: (mode: 'all-data' | 'only-app-db' = 'all-data') => {
       Effect.gen(this, function* () {
-        const clientId = this.clientSession.clientId
-        yield* this.clientSession.leaderThread.sendDevtoolsMessage(
+        const clientId = this[StoreInternalsSymbol].clientSession.clientId
+        yield* this[StoreInternalsSymbol].clientSession.leaderThread.sendDevtoolsMessage(
           Devtools.Leader.ResetAllData.Request.make({ liveStoreVersion, mode, requestId: nanoid(), clientId }),
         )
       }).pipe(this.runEffectFork)
     },
 
     overrideNetworkStatus: (status: 'online' | 'offline') => {
-      const clientId = this.clientSession.clientId
-      this.clientSession.leaderThread
+      const clientId = this[StoreInternalsSymbol].clientSession.clientId
+      this[StoreInternalsSymbol].clientSession.leaderThread
         .sendDevtoolsMessage(
           Devtools.Leader.SetSyncLatch.Request.make({
             clientId,
@@ -798,43 +943,56 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
         .pipe(this.runEffectFork)
     },
 
-    syncStates: () => {
+    syncStates: () =>
+      Effect.gen(this, function* () {
+        const session = yield* this[StoreInternalsSymbol].syncProcessor.syncState
+        const leader = yield* this[StoreInternalsSymbol].clientSession.leaderThread.syncState
+        return { session, leader }
+      }).pipe(this.runEffectPromise),
+
+    printSyncStates: () => {
       Effect.gen(this, function* () {
-        const session = yield* this.syncProcessor.syncState
-        console.log('Session sync state:', session.toJSON())
-        const leader = yield* this.clientSession.leaderThread.getSyncState
-        console.log('Leader sync state:', leader.toJSON())
+        const session = yield* this[StoreInternalsSymbol].syncProcessor.syncState
+        yield* Effect.log(
+          `Session sync state: ${session.localHead} (upstream: ${session.upstreamHead})`,
+          session.toJSON(),
+        )
+        const leader = yield* this[StoreInternalsSymbol].clientSession.leaderThread.syncState
+        yield* Effect.log(`Leader sync state: ${leader.localHead} (upstream: ${leader.upstreamHead})`, leader.toJSON())
       }).pipe(this.runEffectFork)
     },
 
     version: liveStoreVersion,
 
     otel: {
-      rootSpanContext: () => otel.trace.getSpan(this.otel.rootSpanContext)?.spanContext(),
+      rootSpanContext: () => otel.trace.getSpan(this[StoreInternalsSymbol].otel.rootSpanContext)?.spanContext(),
     },
   }
 
   // NOTE This is needed because when booting a Store via Effect it seems to call `toJSON` in the error path
   toJSON = () => ({
     _tag: 'livestore.Store',
-    reactivityGraph: this.reactivityGraph.getSnapshot({ includeResults: true }),
+    reactivityGraph: this[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true }),
   })
 
   private runEffectFork = <A, E>(effect: Effect.Effect<A, E, Scope.Scope>) =>
     effect.pipe(
-      Effect.forkIn(this.effectContext.lifetimeScope),
+      Effect.forkIn(this[StoreInternalsSymbol].effectContext.lifetimeScope),
       Effect.tapCauseLogPretty,
-      Runtime.runFork(this.effectContext.runtime),
+      Runtime.runFork(this[StoreInternalsSymbol].effectContext.runtime),
     )
 
+  private runEffectPromise = <A, E>(effect: Effect.Effect<A, E, Scope.Scope>) =>
+    effect.pipe(Effect.tapCauseLogPretty, Runtime.runPromise(this[StoreInternalsSymbol].effectContext.runtime))
+
   private getCommitArgs = (
     firstEventOrTxnFnOrOptions: any,
     restEvents: any[],
   ): {
-    events: LiveStoreEvent.PartialForSchema<TSchema>[]
+    events: LiveStoreEvent.Input.ForSchema<TSchema>[]
     options: StoreCommitOptions | undefined
   } => {
-    let events: LiveStoreEvent.PartialForSchema<TSchema>[]
+    let events: LiveStoreEvent.Input.ForSchema<TSchema>[]
     let options: StoreCommitOptions | undefined
 
     if (typeof firstEventOrTxnFnOrOptions === 'function') {
@@ -857,7 +1015,7 @@ export class Store<TSchema extends LiveStoreSchema = LiveStoreSchema.Any, TConte
 
     // for (const event of events) {
     //   if (event.args.id === SessionIdSymbol) {
-    //     event.args.id = this.clientSession.sessionId
+    //     event.args.id = this.sessionId
     //   }
     // }