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

package/dist/store/store.js

@@ -1,6 +1,6 @@
-import { Devtools, getDurationMsFromSpan, getExecStatementsFromMaterializer, getResultSchema, hashMaterializerResults, IntentionalShutdownCause, isQueryBuilder, liveStoreVersion, makeClientSessionSyncProcessor, prepareBindValues, QueryBuilderAstSymbol, replaceSessionIdSymbol, UnexpectedError, } from '@livestore/common';
-import { getEventDef, LiveStoreEvent, SystemTables } from '@livestore/common/schema';
-import { assertNever, isDevEnv, notYetImplemented } from '@livestore/utils';
+import { Devtools, getExecStatementsFromMaterializer, getResultSchema, hashMaterializerResults, IntentionalShutdownCause, isQueryBuilder, liveStoreVersion, MaterializeError, MaterializerHashMismatchError, makeClientSessionSyncProcessor, prepareBindValues, QueryBuilderAstSymbol, replaceSessionIdSymbol, UnknownError, } from '@livestore/common';
+import { LiveStoreEvent, resolveEventDef, SystemTables } from '@livestore/common/schema';
+import { assertNever, isDevEnv, notYetImplemented, omitUndefineds, shouldNeverHappen } from '@livestore/utils';
 import { Cause, Effect, Exit, Fiber, Inspectable, Option, OtelTracer, Runtime, Schema, Stream, } from '@livestore/utils/effect';
 import { nanoid } from '@livestore/utils/nanoid';
 import * as otel from '@opentelemetry/api';
@@ -10,98 +10,170 @@ import { queryDb } from "../live-queries/db-query.js";
 import { SqliteDbWrapper } from "../SqliteDbWrapper.js";
 import { ReferenceCountedSet } from "../utils/data-structures.js";
 import { downloadBlob, exposeDebugUtils } from "../utils/dev.js";
+import { StoreInternalsSymbol, } from "./store-types.js";
 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 extends Inspectable.Class {
+    /** Unique identifier for this Store instance, stable for its lifetime. */
     storeId;
-    reactivityGraph;
-    sqliteDbWrapper;
-    clientSession;
+    /** The LiveStore schema defining tables, events, and materializers. */
     schema;
+    /** User-defined context attached to this Store (e.g. for dependency injection). */
     context;
-    otel;
     /**
-     * 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.
+     * 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,
+     * )
+     * ```
+     */
+    networkStatus;
+    /**
+     * Store internals. Not part of the public API — shapes and semantics may change without notice.
      */
-    tableRefs;
-    /** Tracks whether the store has been shut down */
-    isShutdown = false;
-    effectContext;
-    /** RC-based set to see which queries are currently subscribed to */
-    activeQueries;
-    // NOTE this is currently exposed for the Devtools databrowser to commit events
-    __eventSchema;
-    syncProcessor;
-    boot;
+    [StoreInternalsSymbol];
     // #region constructor
     constructor({ clientSession, schema, otelOptions, context, batchUpdates, storeId, effectContext, params, confirmUnsavedChanges, __runningInDevtools, }) {
         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);
+            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(),
+                        sessionChangeset: { _tag: 'no-op' },
+                        materializerHash: Option.none(),
+                    };
+                }
+                const { eventDef, materializer } = resolution;
                 const execArgsArr = getExecStatementsFromMaterializer({
                     eventDef,
                     materializer,
-                    dbState: this.sqliteDbWrapper,
-                    event: { decoded: eventDecoded, encoded: undefined },
+                    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) {
-                    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.`,
-                    })));
+                    return yield* MaterializerHashMismatchError.make({ eventName: eventEncoded.name });
                 }
+                const span = yield* OtelTracer.currentOtelSpan.pipe(Effect.orDie);
+                const otelContext = otel.trace.setSpan(otel.context.active(), span);
                 const writeTablesForEvent = new Set();
                 const exec = () => {
-                    for (const { statementSql, bindValues, writeTables = this.sqliteDbWrapper.getTablesUsed(statementSql), } of execArgsArr) {
+                    for (const { statementSql, bindValues, writeTables = this[StoreInternalsSymbol].sqliteDbWrapper.getTablesUsed(statementSql), } of execArgsArr) {
                         try {
-                            this.sqliteDbWrapper.cachedExecute(statementSql, bindValues, { otelContext, writeTables });
+                            this[StoreInternalsSymbol].sqliteDbWrapper.cachedExecute(statementSql, bindValues, {
+                                otelContext,
+                                writeTables,
+                            });
                         }
                         catch (cause) {
-                            throw UnexpectedError.make({
+                            // TOOD refactor with `SqliteError`
+                            throw UnknownError.make({
                                 cause,
-                                note: `Error executing materializer for event "${eventDecoded.name}".\nStatement: ${statementSql}\nBind values: ${JSON.stringify(bindValues)}`,
+                                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.sqliteDbWrapper.debug.head = eventDecoded.seqNum;
+                        this[StoreInternalsSymbol].sqliteDbWrapper.debug.head = eventEncoded.seqNum;
                     }
                 };
                 let sessionChangeset = { _tag: 'unset' };
                 if (withChangeset === true) {
-                    sessionChangeset = this.sqliteDbWrapper.withChangeset(exec).changeset;
+                    sessionChangeset = this[StoreInternalsSymbol].sqliteDbWrapper.withChangeset(exec).changeset;
                 }
                 else {
                     exec();
                 }
                 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 = [];
                 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]);
                 }
@@ -109,21 +181,23 @@ export class Store extends Inspectable.Class {
             },
             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 = {};
+        const activeQueries = new ReferenceCountedSet();
         const commitsSpan = otelOptions.tracer.startSpan('LiveStore:commits', {}, otelOptions.rootSpanContext);
         const otelMuationsSpanContext = otel.trace.setSpan(otel.context.active(), commitsSpan);
         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,
             defRcMap: new Map(),
             reactivityGraph: new WeakRef(reactivityGraph),
@@ -131,7 +205,7 @@ export class Store extends Inspectable.Class {
             rootOtelContext: otelQueriesSpanContext,
             effectsWrapper: batchUpdates,
         };
-        this.otel = {
+        const otelObj = {
             tracer: otelOptions.tracer,
             rootSpanContext: otelOptions.rootSpanContext,
             commitsSpanContext: otelMuationsSpanContext,
@@ -144,24 +218,24 @@ export class Store extends Inspectable.Class {
         __runningInDevtools
             ? this.schema.state.sqlite.tables.keys()
             : Array.from(this.schema.state.sqlite.tables.keys()).filter((_) => !SystemTables.isStateSystemTable(_)));
-        const existingTableRefs = new Map(Array.from(this.reactivityGraph.atoms.values())
+        const existingTableRefs = new Map(Array.from(reactivityGraph.atoms.values())
             .filter((_) => _._tag === 'ref' && _.label?.startsWith('tableRef:') === true)
             .map((_) => [_.label.slice('tableRef:'.length), _]));
         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);
                     }
                 }
                 // End the otel spans
@@ -169,63 +243,126 @@ export class Store extends Inspectable.Class {
                 commitsSpan.end();
                 queriesSpan.end();
             }));
-            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),
+            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() {
-        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() {
-        return this.clientSession.clientId;
+        return this[StoreInternalsSymbol].clientSession.clientId;
     }
     checkShutdown = (operation) => {
-        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.`,
             });
         }
     };
     /**
-     * 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 = (query, options) => {
+    subscribe = ((query, onUpdateOrOptions, maybeOptions) => {
+        if (typeof onUpdateOrOptions === 'function') {
+            return this.subscribeWithCallback(query, onUpdateOrOptions, maybeOptions);
+        }
+        return this.subscribeAsAsyncIterable(query, onUpdateOrOptions);
+    });
+    subscribeWithCallback = (query, onUpdate, options) => {
         this.checkShutdown('subscribe');
-        return this.otel.tracer.startActiveSpan(`LiveStore.subscribe`, { attributes: { label: options?.label, queryLabel: isQueryBuilder(query) ? query.toString() : query.label } }, options?.otelContext ?? this.otel.queriesSpanContext, (span) => {
-            // console.debug('store sub', query$.id, query$.label)
+        return this[StoreInternalsSymbol].otel.tracer.startActiveSpan(`LiveStore.subscribe`, { attributes: { label: options?.label, queryLabel: isQueryBuilder(query) ? query.toString() : query.label } }, options?.otelContext ?? this[StoreInternalsSymbol].otel.queriesSpanContext, (span) => {
             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,
                         deref: () => { },
                     };
             const query$ = queryRcRef.value;
             const label = `subscribe:${options?.label}`;
-            const effect = this.reactivityGraph.makeEffect((get, _otelContext, debugRefreshReason) => options.onUpdate(get(query$.results$, otelContext, debugRefreshReason)), { label });
+            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);
             }
             options?.onSubscribe?.(query$);
-            this.activeQueries.add(query$);
-            // 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}` });
+            this[StoreInternalsSymbol].activeQueries.add(query$);
+            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$);
+                    this[StoreInternalsSymbol].reactivityGraph.destroyNode(effect);
+                    this[StoreInternalsSymbol].activeQueries.remove(query$);
                     if (options?.stackInfo) {
                         query$.activeSubscriptions.delete(options.stackInfo);
                     }
@@ -239,13 +376,16 @@ export class Store extends Inspectable.Class {
             return unsubscribe;
         });
     };
-    subscribeStream = (query$, options) => Stream.asyncPush((emit) => Effect.gen(this, function* () {
+    subscribeAsAsyncIterable = (query, options) => {
+        this.checkShutdown('subscribe');
+        return Stream.toAsyncIterable(this.subscribeStream(query, options));
+    };
+    subscribeStream = (query, options) => Stream.asyncPush((emit) => Effect.gen(this, function* () {
         const otelSpan = yield* OtelTracer.currentOtelSpan.pipe(Effect.catchTag('NoSuchElementException', () => Effect.succeed(undefined)));
         const otelContext = otelSpan ? otel.trace.setSpan(otel.context.active(), otelSpan) : otel.context.active();
-        yield* Effect.acquireRelease(Effect.sync(() => this.subscribe(query$, {
-            onUpdate: (result) => emit.single(result),
+        yield* Effect.acquireRelease(Effect.sync(() => this.subscribe(query, (result) => emit.single(result), {
+            ...(options ?? {}),
             otelContext,
-            label: options?.label,
         })), (unsub) => Effect.sync(() => unsub()));
     }));
     /**
@@ -265,8 +405,8 @@ export class Store extends Inspectable.Class {
     query = (query, options) => {
         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,
+            const res = this[StoreInternalsSymbol].sqliteDbWrapper.cachedSelect(query.query, prepareBindValues(query.bindValues, query.query), {
+                ...omitUndefineds({ otelContext: options?.otelContext }),
             });
             if (query.schema) {
                 return Schema.decodeSync(query.schema)(res);
@@ -281,32 +421,40 @@ export class Store extends Inspectable.Class {
                     id: ast.id,
                     explicitDefaultValues: ast.explicitDefaultValues,
                     otelContext: options?.otelContext,
-                })(this.reactivityGraph.context);
+                })(this[StoreInternalsSymbol].reactivityGraph.context);
             }
             const sqlRes = query.asSql();
             const schema = getResultSchema(query);
             // 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, {
-                otelContext: options?.otelContext,
+            const rawRes = this[StoreInternalsSymbol].sqliteDbWrapper.cachedSelect(sqlRes.query, sqlRes.bindValues, {
+                ...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 }),
+            });
         }
     };
     /**
@@ -326,7 +474,7 @@ export class Store extends Inspectable.Class {
      */
     setSignal = (signalDef, value) => {
         this.checkShutdown('setSignal');
-        const signalRef = signalDef.make(this.reactivityGraph.context);
+        const signalRef = signalDef.make(this[StoreInternalsSymbol].reactivityGraph.context);
         const newValue = typeof value === 'function' ? value(signalRef.value.get()) : value;
         signalRef.value.set(newValue);
         // The current implementation of signals i.e. the separation into `signal-def` and `signal`
@@ -393,73 +541,67 @@ export class Store extends Inspectable.Class {
     commit = (firstEventOrTxnFnOrOptions, ...restEvents) => {
         this.checkShutdown('commit');
         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;
-        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;
-        return this.otel.tracer.startActiveSpan('LiveStore:commit', {
+        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() });
+            for (const event of events) {
+                replaceSessionIdSymbol(event.args, this[StoreInternalsSymbol].clientSession.sessionId);
+            }
+            if (events.length === 0)
+                return;
+            const localRuntime = yield* Effect.runtime();
+            const materializeEventsTx = Effect.try({
+                try: () => {
+                    const runMaterializeEvents = () => {
+                        return this[StoreInternalsSymbol].syncProcessor.push(events).pipe(Runtime.runSync(localRuntime));
+                    };
+                    if (events.length > 1) {
+                        return this[StoreInternalsSymbol].sqliteDbWrapper.txn(runMaterializeEvents);
+                    }
+                    else {
+                        return runMaterializeEvents();
+                    }
+                },
+                catch: (cause) => UnknownError.make({ cause }),
+            });
+            // Materialize events to state
+            const { writeTables } = yield* materializeEventsTx;
+            const tablesToUpdate = [];
+            for (const tableName of writeTables) {
+                const tableRef = this[StoreInternalsSymbol].tableRefs[tableName];
+                assertNever(tableRef !== undefined, `No table ref found for ${tableName}`);
+                tablesToUpdate.push([tableRef, null]);
+            }
+            const debugRefreshReason = {
+                _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),
-                'livestore.commitLabel': options?.label,
+                ...(options?.label && { 'livestore.commitLabel': options.label }),
             },
-            links: options?.spanLinks,
-        }, options?.otelContext ?? this.otel.commitsSpanContext, (span) => {
-            const otelContext = otel.trace.setSpan(otel.context.active(), span);
-            try {
-                // Materialize events to state
-                const { writeTables } = (() => {
-                    try {
-                        const materializeEvents = () => this.syncProcessor.push(events, { otelContext });
-                        if (events.length > 1) {
-                            return this.sqliteDbWrapper.txn(materializeEvents);
-                        }
-                        else {
-                            return materializeEvents();
-                        }
-                    }
-                    catch (e) {
-                        console.error(e);
-                        span.setStatus({ code: otel.SpanStatusCode.ERROR, message: e.toString() });
-                        throw e;
-                    }
-                    finally {
-                        span.end();
-                    }
-                })();
-                const tablesToUpdate = [];
-                for (const tableName of writeTables) {
-                    const tableRef = this.tableRefs[tableName];
-                    assertNever(tableRef !== undefined, `No table ref found for ${tableName}`);
-                    tablesToUpdate.push([tableRef, null]);
-                }
-                const debugRefreshReason = {
-                    _tag: 'commit',
-                    events,
-                    writeTables: Array.from(writeTables),
-                };
-                // Update all table refs together in a batch, to only trigger one reactive update
-                this.reactivityGraph.setRefs(tablesToUpdate, { debugRefreshReason, otelContext, skipRefresh });
-            }
-            catch (e) {
-                console.error(e);
-                span.setStatus({ code: otel.SpanStatusCode.ERROR, message: e.toString() });
-                throw e;
-            }
-            finally {
-                span.end();
-                durationMs = getDurationMsFromSpan(span);
-            }
-            return { durationMs };
-        });
+            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
     /**
@@ -495,9 +637,9 @@ export class Store extends Inspectable.Class {
     manualRefresh = (options) => {
         this.checkShutdown('manualRefresh');
         const { label } = options ?? {};
-        this.otel.tracer.startActiveSpan('LiveStore:manualRefresh', { attributes: { 'livestore.manualRefreshLabel': label } }, this.otel.commitsSpanContext, (span) => {
+        this[StoreInternalsSymbol].otel.tracer.startActiveSpan('LiveStore:manualRefresh', { attributes: { 'livestore.manualRefreshLabel': label } }, 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();
         });
     };
@@ -508,7 +650,7 @@ export class Store extends Inspectable.Class {
      */
     shutdownPromise = async (cause) => {
         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);
     };
     /**
@@ -517,9 +659,8 @@ export class Store extends Inspectable.Class {
      * This is called automatically when the store was created using the React or Effect API.
      */
     shutdown = (cause) => {
-        this.checkShutdown('shutdown');
-        this.isShutdown = true;
-        return this.clientSession.shutdown(cause ? Exit.failCause(cause) : Exit.succeed(IntentionalShutdownCause.make({ reason: 'manual' })));
+        this[StoreInternalsSymbol].isShutdown = true;
+        return this[StoreInternalsSymbol].clientSession.shutdown(cause ? Exit.failCause(cause) : Exit.succeed(IntentionalShutdownCause.make({ reason: 'manual' })));
     };
     /**
      * Helper methods useful during development
@@ -529,25 +670,27 @@ export class Store extends Inspectable.Class {
     _dev = {
         downloadDb: (source = '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') => {
             Effect.gen(this, function* () {
-                const clientId = this.clientSession.clientId;
-                yield* this.clientSession.leaderThread.sendDevtoolsMessage(Devtools.Leader.ResetAllData.Request.make({ liveStoreVersion, mode, requestId: nanoid(), clientId }));
+                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) => {
-            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,
                 closeLatch: status === 'offline',
@@ -556,25 +699,31 @@ export class Store extends Inspectable.Class {
             }))
                 .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 }),
     });
-    runEffectFork = (effect) => effect.pipe(Effect.forkIn(this.effectContext.lifetimeScope), Effect.tapCauseLogPretty, Runtime.runFork(this.effectContext.runtime));
+    runEffectFork = (effect) => effect.pipe(Effect.forkIn(this[StoreInternalsSymbol].effectContext.lifetimeScope), Effect.tapCauseLogPretty, Runtime.runFork(this[StoreInternalsSymbol].effectContext.runtime));
+    runEffectPromise = (effect) => effect.pipe(Effect.tapCauseLogPretty, Runtime.runPromise(this[StoreInternalsSymbol].effectContext.runtime));
     getCommitArgs = (firstEventOrTxnFnOrOptions, restEvents) => {
         let events;
         let options;
@@ -598,7 +747,7 @@ export class Store extends Inspectable.Class {
         }
         // for (const event of events) {
         //   if (event.args.id === SessionIdSymbol) {
-        //     event.args.id = this.clientSession.sessionId
+        //     event.args.id = this.sessionId
         //   }
         // }
         return { events, options };