@livestore/common 0.4.0-dev.9 → 0.5.0-dev.0

package/dist/sync/sync-backend.d.ts

@@ -1,25 +1,25 @@
 import { type Cause, type Effect, type HttpClient, type KeyValueStore, Option, Schema, type Scope, type Stream, type SubscriptionRef } from '@livestore/utils/effect';
-import type { UnexpectedError } from '../adapter-types.ts';
-import type * as LiveStoreEvent from '../schema/LiveStoreEvent.ts';
+import type { UnknownError } from '../adapter-types.ts';
+import type * as LiveStoreEvent from '../schema/LiveStoreEvent/mod.ts';
 import type { EventSequenceNumber } from '../schema/mod.ts';
-import type { InvalidPullError, InvalidPushError, IsOfflineError } from './errors.ts';
+import type { BackendIdMismatchError, IsOfflineError, ServerAheadError } from './errors.ts';
 export * from './sync-backend-kv.ts';
 /**
  * Those arguments can be used to implement multi-tenancy etc and are passed in from the store.
  */
-export type MakeBackendArgs = {
+export type MakeBackendArgs<TPayload = Schema.Json> = {
     storeId: string;
     clientId: string;
-    payload: Schema.JsonValue | undefined;
+    payload: TPayload | undefined;
 };
-export type SyncBackendConstructor<TSyncMetadata = Schema.JsonValue> = (args: MakeBackendArgs) => Effect.Effect<SyncBackend<TSyncMetadata>, UnexpectedError, Scope.Scope | HttpClient.HttpClient | KeyValueStore.KeyValueStore>;
-export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
+export type SyncBackendConstructor<TSyncMetadata = Schema.Json, TPayload = Schema.Json> = (args: MakeBackendArgs<TPayload>) => Effect.Effect<SyncBackend<TSyncMetadata>, UnknownError, Scope.Scope | HttpClient.HttpClient | KeyValueStore.KeyValueStore>;
+export type SyncBackend<TSyncMetadata = Schema.Json> = {
     /**
      * Can be implemented to prepare a connection to the sync backend to speed up the first pull/push.
      */
-    connect: Effect.Effect<void, IsOfflineError | UnexpectedError, Scope.Scope>;
+    connect: Effect.Effect<void, IsOfflineError | UnknownError, Scope.Scope>;
     pull: (cursor: Option.Option<{
-        eventSequenceNumber: EventSequenceNumber.GlobalEventSequenceNumber;
+        eventSequenceNumber: EventSequenceNumber.Global.Type;
         /** Metadata is needed by some sync backends */
         metadata: Option.Option<TSyncMetadata>;
     }>, options?: {
@@ -29,15 +29,15 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
          * @default false
          */
         live?: boolean;
-    }) => Stream.Stream<PullResItem<TSyncMetadata>, IsOfflineError | InvalidPullError>;
+    }) => Stream.Stream<PullResItem<TSyncMetadata>, IsOfflineError | BackendIdMismatchError | UnknownError>;
     push: (
     /**
      * Constraints for batch:
      * - Number of events: 1-100
      * - sequence numbers must be in ascending order
      * */
-    batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>) => Effect.Effect<void, IsOfflineError | InvalidPushError>;
-    ping: Effect.Effect<void, IsOfflineError | UnexpectedError | Cause.TimeoutException>;
+    batch: ReadonlyArray<LiveStoreEvent.Global.Encoded>) => Effect.Effect<void, IsOfflineError | BackendIdMismatchError | UnknownError | ServerAheadError>;
+    ping: Effect.Effect<void, IsOfflineError | UnknownError | Cause.TimeoutError>;
     isConnected: SubscriptionRef.SubscriptionRef<boolean>;
     /**
      * Metadata describing the sync backend. (Currently only used by devtools.)
@@ -45,7 +45,7 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
     metadata: {
         name: string;
         description: string;
-    } & Record<string, Schema.JsonValue>;
+    } & Record<string, Schema.Json>;
     /** Information about the sync backend capabilities. */
     supports: {
         /**
@@ -59,27 +59,47 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
         pullLive: boolean;
     };
 };
-export declare const PullResPageInfo: Schema.Union<[Schema.TaggedStruct<"MoreUnknown", {}>, Schema.TaggedStruct<"MoreKnown", {
-    remaining: typeof Schema.Number;
+/**
+ * Connectivity metadata emitted by sync backends.
+ */
+export declare const NetworkStatus: Schema.Struct<{
+    /** True when the upstream sync backend is reachable and responding to health checks. */
+    readonly isConnected: Schema.Boolean;
+    /** Unix epoch timestamp (ms) of the latest connectivity state transition. */
+    readonly timestampMs: Schema.Finite;
+    /** Devtools specific metadata describing simulator overrides. */
+    readonly devtools: Schema.Struct<{
+        /** Indicates whether the devtools latch forced the client into an offline state. */
+        readonly latchClosed: Schema.Boolean;
+    }>;
+}>;
+export type NetworkStatus = typeof NetworkStatus.Type;
+/**
+ * Runtime type guard for SyncBackend objects.
+ * Performs lightweight structural checks on the object shape.
+ */
+export declare const isSyncBackend: (value: unknown) => value is SyncBackend<any>;
+export declare const PullResPageInfo: Schema.Union<readonly [Schema.TaggedStruct<"MoreUnknown", {}>, Schema.TaggedStruct<"MoreKnown", {
+    readonly remaining: Schema.Finite;
 }>, Schema.TaggedStruct<"NoMore", {}>]>;
 export type PullResPageInfo = typeof PullResPageInfo.Type;
 export declare const pageInfoNoMore: PullResPageInfo;
 export declare const pageInfoMoreUnknown: PullResPageInfo;
 export declare const pageInfoMoreKnown: (remaining: number) => PullResPageInfo;
-export declare const pullResItemEmpty: <TSyncMetadata = Schema.JsonValue>() => PullResItem<TSyncMetadata>;
-export interface PullResItem<TSyncMetadata = Schema.JsonValue> {
+export declare const pullResItemEmpty: <TSyncMetadata = Schema.Json>() => PullResItem<TSyncMetadata>;
+export interface PullResItem<TSyncMetadata = Schema.Json> {
     batch: ReadonlyArray<{
-        eventEncoded: LiveStoreEvent.AnyEncodedGlobal;
+        eventEncoded: LiveStoreEvent.Global.Encoded;
         metadata: Option.Option<TSyncMetadata>;
     }>;
     pageInfo: PullResPageInfo;
 }
-export declare const of: <TSyncMetadata = Schema.JsonValue>(obj: SyncBackend<TSyncMetadata>) => SyncBackend<TSyncMetadata>;
+export declare const of: <TSyncMetadata = Schema.Json>(obj: SyncBackend<TSyncMetadata>) => SyncBackend<TSyncMetadata>;
 /**
  * Useful to continue pulling from the last event in the batch.
  */
-export declare const cursorFromPullResItem: <TSyncMetadata = Schema.JsonValue>(item: PullResItem<TSyncMetadata>) => Option.Option<{
-    eventSequenceNumber: EventSequenceNumber.GlobalEventSequenceNumber;
+export declare const cursorFromPullResItem: <TSyncMetadata = Schema.Json>(item: PullResItem<TSyncMetadata>) => Option.Option<{
+    eventSequenceNumber: EventSequenceNumber.Global.Type;
     metadata: Option.Option<TSyncMetadata>;
 }>;
 //# sourceMappingURL=sync-backend.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sync-backend.d.ts","sourceRoot":"","sources":["../../src/sync/sync-backend.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-backend.d.ts","sourceRoot":"","sources":["../../src/sync/sync-backend.ts"],"names":[],"mappings":"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"}

package/dist/sync/sync-backend.js

@@ -1,8 +1,49 @@
 import { Option, Schema, } from '@livestore/utils/effect';
 export * from "./sync-backend-kv.js";
-export const PullResPageInfo = Schema.Union(Schema.TaggedStruct('MoreUnknown', {}), Schema.TaggedStruct('MoreKnown', {
-    remaining: Schema.Number,
-}), Schema.TaggedStruct('NoMore', {}));
+/**
+ * Connectivity metadata emitted by sync backends.
+ */
+export const NetworkStatus = Schema.Struct({
+    /** True when the upstream sync backend is reachable and responding to health checks. */
+    isConnected: Schema.Boolean,
+    /** Unix epoch timestamp (ms) of the latest connectivity state transition. */
+    timestampMs: Schema.Finite,
+    /** Devtools specific metadata describing simulator overrides. */
+    devtools: Schema.Struct({
+        /** Indicates whether the devtools latch forced the client into an offline state. */
+        latchClosed: Schema.Boolean,
+    }),
+}).annotate({ title: 'NetworkStatus' });
+/**
+ * Runtime type guard for SyncBackend objects.
+ * Performs lightweight structural checks on the object shape.
+ */
+export const isSyncBackend = (value) => {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const v = value;
+    const hasCoreFns = typeof v.connect === 'function' &&
+        typeof v.pull === 'function' &&
+        typeof v.push === 'function' &&
+        typeof v.ping === 'function';
+    const hasSupports = typeof v.supports === 'object' &&
+        v.supports !== null &&
+        typeof v.supports.pullPageInfoKnown === 'boolean' &&
+        typeof v.supports.pullLive === 'boolean';
+    const hasMetadata = typeof v.metadata === 'object' &&
+        v.metadata !== null &&
+        typeof v.metadata.name === 'string' &&
+        typeof v.metadata.description === 'string';
+    const hasIsConnected = typeof v.isConnected === 'object' && v.isConnected !== null;
+    return hasCoreFns && hasSupports && hasMetadata && hasIsConnected;
+};
+export const PullResPageInfo = Schema.Union([
+    Schema.TaggedStruct('MoreUnknown', {}),
+    Schema.TaggedStruct('MoreKnown', {
+        remaining: Schema.Finite,
+    }),
+    Schema.TaggedStruct('NoMore', {}),
+]);
 export const pageInfoNoMore = { _tag: 'NoMore' };
 export const pageInfoMoreUnknown = { _tag: 'MoreUnknown' };
 export const pageInfoMoreKnown = (remaining) => ({ _tag: 'MoreKnown', remaining });
@@ -16,7 +57,7 @@ export const of = (obj) => obj;
  */
 export const cursorFromPullResItem = (item) => {
     const lastEvent = item.batch.at(-1);
-    if (!lastEvent) {
+    if (lastEvent == null) {
         return Option.none();
     }
     return Option.some({ eventSequenceNumber: lastEvent.eventEncoded.seqNum, metadata: lastEvent.metadata });

package/dist/sync/sync-backend.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-backend.js","sourceRoot":"","sources":["../../src/sync/sync-backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,MAAM,EACN,MAAM,GAIP,MAAM,yBAAyB,CAAA;AAMhC,cAAc,sBAAsB,CAAA;AA6EpC,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CACzC,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,EAAE,CAAC,EACtC,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE;IAC/B,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,CAClC,CAAA;AAID,MAAM,CAAC,MAAM,cAAc,GAAoB,EAAE,IAAI,EAAE,QAAQ,EAAW,CAAA;AAC1E,MAAM,CAAC,MAAM,mBAAmB,GAAoB,EAAE,IAAI,EAAE,aAAa,EAAW,CAAA;AACpF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAmB,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAA;AAE3G,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAiE,EAAE,CAAC,CAAC;IACnG,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,cAAc;CACzB,CAAC,CAAA;AAUF,MAAM,CAAC,MAAM,EAAE,GAAG,CAAmC,GAA+B,EAAE,EAAE,CAAC,GAAG,CAAA;AAE5F;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,IAAgC,EAI/B,EAAE;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACnC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,mBAAmB,EAAE,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAA;AAC1G,CAAC,CAAA"}
+{"version":3,"file":"sync-backend.js","sourceRoot":"","sources":["../../src/sync/sync-backend.ts"],"names":[],"mappings":"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"}

package/dist/sync/sync.d.ts

@@ -1,9 +1,10 @@
 export * from './errors.ts';
 export * as SyncBackend from './sync-backend.ts';
+import type { Schema } from '@livestore/utils/effect';
 import type { InitialSyncOptions } from '../leader-thread/types.ts';
 import type { SyncBackendConstructor } from './sync-backend.ts';
-export type SyncOptions = {
-    backend?: SyncBackendConstructor<any>;
+export type SyncOptions<TPayload = Schema.Json> = {
+    backend?: SyncBackendConstructor<any, TPayload>;
     /** @default { _tag: 'Skip' } */
     initialSyncOptions?: InitialSyncOptions;
     /**
@@ -16,6 +17,26 @@ export type SyncOptions = {
      * @default 'ignore'
      * */
     onSyncError?: 'shutdown' | 'ignore';
+    /**
+     * What to do when the sync backend identity has changed (i.e. the backend was reset).
+     *
+     * This commonly happens during development when:
+     * - The sync backend state is deleted (e.g. `.wrangler/state` for Cloudflare)
+     * - Running with a `--reset` flag
+     * - Schema changes require re-backfilling data
+     *
+     * Options:
+     * - `'reset'`: Clear local storage (eventlog and state databases) and shutdown.
+     *   The app will need to restart and will sync fresh data from the backend.
+     *   This is the recommended option for development.
+     * - `'shutdown'`: Shutdown without clearing local storage.
+     *   On restart, the client will still have stale data and hit the same error.
+     * - `'ignore'`: Log the error and continue running.
+     *   The client will show stale data but keep running (effectively offline mode).
+     *
+     * @default 'reset'
+     */
+    onBackendIdMismatch?: 'reset' | 'shutdown' | 'ignore';
     /**
      * Whether the sync backend should reactively pull new events from the sync backend
      * @default true

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

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAEhD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE/D,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAA;IACrC,gCAAgC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC;;;;;;;;SAQK;IACL,WAAW,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IACnC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAEhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE/D,MAAM,MAAM,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,IAAI;IAChD,OAAO,CAAC,EAAE,sBAAsB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAC/C,gCAAgC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC;;;;;;;;SAQK;IACL,WAAW,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IACnC;;;;;;;;;;;;;;;;;;OAkBG;IACH,mBAAmB,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAA;IACrD;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA"}

package/dist/sync/syncstate.d.ts

@@ -1,48 +1,25 @@
-import { Schema } from '@livestore/utils/effect';
-import * as LiveStoreEvent from '../schema/LiveStoreEvent.ts';
-declare const SyncState_base: Schema.Class<SyncState, {
-    pending: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
+import { Effect, Schema } from '@livestore/utils/effect';
+import * as EventSequenceNumber from '../schema/EventSequenceNumber/mod.ts';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent/mod.ts';
+declare const SyncState_base: Schema.Class<SyncState, Schema.Struct<{
+    readonly pending: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
     /** What this node expects the next upstream node to have as its own local head */
-    upstreamHead: Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
-    }>;
-    /** Equivalent to `pending.at(-1)?.id` if there are pending events */
-    localHead: Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
-    }>;
-}, Schema.Struct.Encoded<{
-    pending: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    /** What this node expects the next upstream node to have as its own local head */
-    upstreamHead: Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
-    }>;
-    /** Equivalent to `pending.at(-1)?.id` if there are pending events */
-    localHead: Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
-    }>;
-}>, never, {
-    readonly upstreamHead: {
-        readonly global: number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">;
-        readonly client: number & import("effect/Brand").Brand<"ClientEventSequenceNumber">;
-        readonly rebaseGeneration: number;
+    readonly upstreamHead: Schema.Struct<{
+        readonly global: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+        readonly client: Schema.brand<Schema.Int, "ClientEventSequenceNumber">;
+        readonly rebaseGeneration: Schema.Int;
+    }> & {
+        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
     };
-} & {
-    readonly localHead: {
-        readonly global: number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">;
-        readonly client: number & import("effect/Brand").Brand<"ClientEventSequenceNumber">;
-        readonly rebaseGeneration: number;
+    /** Equivalent to `pending.at(-1)?.id` if there are pending events */
+    readonly localHead: Schema.Struct<{
+        readonly global: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+        readonly client: Schema.brand<Schema.Int, "ClientEventSequenceNumber">;
+        readonly rebaseGeneration: Schema.Int;
+    }> & {
+        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
     };
-} & {
-    readonly pending: readonly LiveStoreEvent.EncodedWithMeta[];
-}, {}, {}>;
+}>, {}>;
 /**
  * SyncState represents the current sync state of a sync node relative to an upstream node.
  * Events flow from local to upstream, with each state maintaining its own event head.
@@ -54,7 +31,7 @@ declare const SyncState_base: Schema.Class<SyncState, {
  *                 +------------------------+
  *               ▼                       ▼
  *        Upstream Head             Local Head
- *             (1,0)     (1,1), (1,2), (2,0)
+ *              e1        e1.1, e1.2, e2
  * ```
  *
  * **Pending Events**: Events awaiting acknowledgment from the upstream.
@@ -70,7 +47,7 @@ declare const SyncState_base: Schema.Class<SyncState, {
  * Invariants:
  * 1. **Chain Continuity**: Each event must reference its immediate parent.
  * 2. **Head Ordering**: Upstream Head ≤ Local Head.
- * 3. **Event number sequence**: Must follow the pattern (1,0)→(1,1)→(1,2)→(2,0).
+ * 3. **Event number sequence**: Must follow the pattern e1→e1.1→e1.2→e2.
  *
  * A few further notes to help form an intuition:
  * - The goal is to keep the pending events as small as possible (i.e. to have synced with the next upstream node)
@@ -83,181 +60,128 @@ declare const SyncState_base: Schema.Class<SyncState, {
 export declare class SyncState extends SyncState_base {
     toJSON: () => any;
 }
-declare const PayloadUpstreamRebase_base: Schema.TaggedStruct<"upstream-rebase", {
-    /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    /** Events which need to be applied after the rollback (already rebased by the upstream node) */
-    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-}>;
 /**
  * This payload propagates a rebase from the upstream node
  */
-export declare class PayloadUpstreamRebase extends PayloadUpstreamRebase_base {
-}
-declare const PayloadUpstreamAdvance_base: Schema.TaggedStruct<"upstream-advance", {
-    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
+export declare const PayloadUpstreamRebase: Schema.TaggedStruct<"upstream-rebase", {
+    /** Events which need to be rolled back */
+    readonly rollbackEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    /** Events which need to be applied after the rollback (already rebased by the upstream node) */
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
 }>;
-export declare class PayloadUpstreamAdvance extends PayloadUpstreamAdvance_base {
-}
-declare const PayloadLocalPush_base: Schema.TaggedStruct<"local-push", {
-    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
+export declare const PayloadUpstreamAdvance: Schema.TaggedStruct<"upstream-advance", {
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
 }>;
-export declare class PayloadLocalPush extends PayloadLocalPush_base {
-}
-declare const Payload_base: Schema.Union<[typeof PayloadUpstreamRebase, typeof PayloadUpstreamAdvance, typeof PayloadLocalPush]>;
-export declare class Payload extends Payload_base {
-}
-declare const PayloadUpstream_base: Schema.Union<[typeof PayloadUpstreamRebase, typeof PayloadUpstreamAdvance]>;
-export declare class PayloadUpstream extends PayloadUpstream_base {
-}
-declare const MergeContext_base: Schema.Class<MergeContext, {
-    payload: typeof Payload;
-    syncState: typeof SyncState;
-}, Schema.Struct.Encoded<{
-    payload: typeof Payload;
-    syncState: typeof SyncState;
-}>, never, {
-    readonly payload: {
-        readonly _tag: "upstream-rebase";
-        readonly rollbackEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-        readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-    } | {
-        readonly _tag: "upstream-advance";
-        readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-    } | {
-        readonly _tag: "local-push";
-        readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-    };
-} & {
-    readonly syncState: SyncState;
-}, {}, {}>;
+export declare const PayloadLocalPush: Schema.TaggedStruct<"local-push", {
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+}>;
+export declare const Payload: Schema.Union<readonly [Schema.TaggedStruct<"upstream-rebase", {
+    /** Events which need to be rolled back */
+    readonly rollbackEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    /** Events which need to be applied after the rollback (already rebased by the upstream node) */
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+}>, Schema.TaggedStruct<"upstream-advance", {
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+}>, Schema.TaggedStruct<"local-push", {
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+}>]>;
+export declare const PayloadUpstream: Schema.Union<readonly [Schema.TaggedStruct<"upstream-rebase", {
+    /** Events which need to be rolled back */
+    readonly rollbackEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    /** Events which need to be applied after the rollback (already rebased by the upstream node) */
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+}>, Schema.TaggedStruct<"upstream-advance", {
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+}>]>;
+declare const MergeContext_base: Schema.Class<MergeContext, Schema.Struct<{
+    readonly payload: Schema.Union<readonly [Schema.TaggedStruct<"upstream-rebase", {
+        /** Events which need to be rolled back */
+        readonly rollbackEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+        /** Events which need to be applied after the rollback (already rebased by the upstream node) */
+        readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    }>, Schema.TaggedStruct<"upstream-advance", {
+        readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    }>, Schema.TaggedStruct<"local-push", {
+        readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    }>]>;
+    readonly syncState: typeof SyncState;
+}>, {}>;
 /** Only used for debugging purposes */
 export declare class MergeContext extends MergeContext_base {
     toJSON: () => any;
 }
-declare const MergeResultAdvance_base: Schema.Class<MergeResultAdvance, {
-    _tag: Schema.Literal<["advance"]>;
-    newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    /** Events which were previously pending but are now confirmed */
-    confirmedEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    mergeContext: typeof MergeContext;
-}, Schema.Struct.Encoded<{
-    _tag: Schema.Literal<["advance"]>;
-    newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
+declare const MergeResultAdvance_base: Schema.Class<MergeResultAdvance, Schema.Struct<{
+    readonly _tag: Schema.Literal<"advance">;
+    readonly newSyncState: typeof SyncState;
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
     /** Events which were previously pending but are now confirmed */
-    confirmedEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    mergeContext: typeof MergeContext;
-}>, never, {
-    readonly _tag: "advance";
-} & {
-    readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-} & {
-    readonly newSyncState: SyncState;
-} & {
-    readonly mergeContext: MergeContext;
-} & {
-    readonly confirmedEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-}, {}, {}>;
+    readonly confirmedEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    readonly mergeContext: typeof MergeContext;
+}>, {}>;
 export declare class MergeResultAdvance extends MergeResultAdvance_base {
     toJSON: () => any;
 }
-declare const MergeResultRebase_base: Schema.Class<MergeResultRebase, {
-    _tag: Schema.Literal<["rebase"]>;
-    newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    mergeContext: typeof MergeContext;
-}, Schema.Struct.Encoded<{
-    _tag: Schema.Literal<["rebase"]>;
-    newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
+declare const MergeResultRebase_base: Schema.Class<MergeResultRebase, Schema.Struct<{
+    readonly _tag: Schema.Literal<"rebase">;
+    readonly newSyncState: typeof SyncState;
+    readonly newEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
     /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
-    mergeContext: typeof MergeContext;
-}>, never, {
-    readonly _tag: "rebase";
-} & {
-    readonly rollbackEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-} & {
-    readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
-} & {
-    readonly newSyncState: SyncState;
-} & {
-    readonly mergeContext: MergeContext;
-}, {}, {}>;
+    readonly rollbackEvents: Schema.$Array<typeof LiveStoreEvent.Client.EncodedWithMeta>;
+    readonly mergeContext: typeof MergeContext;
+}>, {}>;
 export declare class MergeResultRebase extends MergeResultRebase_base {
     toJSON: () => any;
 }
-declare const MergeResultReject_base: Schema.Class<MergeResultReject, {
-    _tag: Schema.Literal<["reject"]>;
+declare const MergeResultReject_base: Schema.Class<MergeResultReject, Schema.Struct<{
+    readonly _tag: Schema.Literal<"reject">;
     /** The minimum id that the new events must have */
-    expectedMinimumId: Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
-    }>;
-    mergeContext: typeof MergeContext;
-}, Schema.Struct.Encoded<{
-    _tag: Schema.Literal<["reject"]>;
-    /** The minimum id that the new events must have */
-    expectedMinimumId: Schema.Struct<{
-        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
-        rebaseGeneration: typeof Schema.Int;
-    }>;
-    mergeContext: typeof MergeContext;
-}>, never, {
-    readonly _tag: "reject";
-} & {
-    readonly mergeContext: MergeContext;
-} & {
-    readonly expectedMinimumId: {
-        readonly global: number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">;
-        readonly client: number & import("effect/Brand").Brand<"ClientEventSequenceNumber">;
-        readonly rebaseGeneration: number;
+    readonly expectedMinimumId: Schema.Struct<{
+        readonly global: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+        readonly client: Schema.brand<Schema.Int, "ClientEventSequenceNumber">;
+        readonly rebaseGeneration: Schema.Int;
+    }> & {
+        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
     };
-}, {}, {}>;
+    readonly mergeContext: typeof MergeContext;
+}>, {}>;
 export declare class MergeResultReject extends MergeResultReject_base {
     toJSON: () => any;
 }
-declare const MergeResultUnexpectedError_base: Schema.Class<MergeResultUnexpectedError, {
-    _tag: Schema.Literal<["unexpected-error"]>;
-    message: typeof Schema.String;
-}, Schema.Struct.Encoded<{
-    _tag: Schema.Literal<["unexpected-error"]>;
-    message: typeof Schema.String;
-}>, never, {
-    readonly _tag: "unexpected-error";
-} & {
-    readonly message: string;
-}, {}, {}>;
-export declare class MergeResultUnexpectedError extends MergeResultUnexpectedError_base {
-}
-declare const MergeResult_base: Schema.Union<[typeof MergeResultAdvance, typeof MergeResultRebase, typeof MergeResultReject, typeof MergeResultUnexpectedError]>;
-export declare class MergeResult extends MergeResult_base {
-}
-export declare const payloadFromMergeResult: (mergeResult: typeof MergeResultAdvance.Type | typeof MergeResultRebase.Type) => typeof PayloadUpstream.Type;
-export declare const merge: ({ syncState, payload, isClientEvent, isEqualEvent, ignoreClientEvents, }: {
+export declare const MergeResult: Schema.Union<readonly [typeof MergeResultAdvance, typeof MergeResultRebase, typeof MergeResultReject]>;
+export declare const payloadFromMergeResult: (mergeResult: MergeResultAdvance | MergeResultRebase) => typeof PayloadUpstream.Type;
+export declare const merge: (args_0: {
     syncState: SyncState;
     payload: typeof Payload.Type;
-    isClientEvent: (event: LiveStoreEvent.EncodedWithMeta) => boolean;
-    isEqualEvent: (a: LiveStoreEvent.EncodedWithMeta, b: LiveStoreEvent.EncodedWithMeta) => boolean;
-    /** This is used in the leader which should ignore client events when receiving an upstream-advance payload */
-    ignoreClientEvents?: boolean;
-}) => typeof MergeResult.Type;
+    /**
+     * `LiveStoreEvent.Client.EncodedWithMeta` does not carry the event definition's
+     * `clientOnly` flag. The caller supplies this schema-aware predicate so `merge`
+     * can preserve the correct sequence-number shape when rebasing: client-only
+     * events advance the client component, synced events advance the global component.
+     */
+    isClientOnlyEvent: (event: LiveStoreEvent.Client.EncodedWithMeta) => boolean;
+    /**
+     * Pending events are confirmed by comparing their logical encoded identity with
+     * upstream events. This is caller-supplied because comparing encoded args may
+     * require event-schema knowledge that the generic merge algorithm does not own.
+     * Implementations should ignore transport/runtime metadata.
+     */
+    isEqualEvent: (a: LiveStoreEvent.Client.EncodedWithMeta, b: LiveStoreEvent.Client.EncodedWithMeta) => boolean;
+    /**
+     * This is used in the leader which should ignore client events when
+     * receiving an upstream-advance payload
+     */
+    ignoreClientOnlyEvents?: boolean;
+}) => Effect.Effect<MergeResultAdvance | MergeResultRebase | MergeResultReject, never, never>;
 /**
  * Gets the index relative to `existingEvents` where the divergence point is
  * by comparing each event in `existingEvents` to the corresponding event in `incomingEvents`
  */
-export declare const findDivergencePoint: ({ existingEvents, incomingEvents, isEqualEvent, isClientEvent, ignoreClientEvents, }: {
-    existingEvents: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>;
-    incomingEvents: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>;
-    isEqualEvent: (a: LiveStoreEvent.EncodedWithMeta, b: LiveStoreEvent.EncodedWithMeta) => boolean;
-    isClientEvent: (event: LiveStoreEvent.EncodedWithMeta) => boolean;
-    ignoreClientEvents: boolean;
+export declare const findDivergencePoint: ({ existingEvents, incomingEvents, isEqualEvent, isClientOnlyEvent, ignoreClientOnlyEvents, }: {
+    existingEvents: ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>;
+    incomingEvents: ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>;
+    isEqualEvent: (a: LiveStoreEvent.Client.EncodedWithMeta, b: LiveStoreEvent.Client.EncodedWithMeta) => boolean;
+    isClientOnlyEvent: (event: LiveStoreEvent.Client.EncodedWithMeta) => boolean;
+    ignoreClientOnlyEvents: boolean;
 }) => number;
 export {};
 //# sourceMappingURL=syncstate.d.ts.map